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.186 by root, Sat Apr 21 09:25:31 2007 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 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
32#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
33 46
34#include <glib/gmacros.h> 47#include <glib/gmacros.h>
35 48
36#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
37 61
38#ifndef _WIN32 62#ifndef _WIN32
39# include <sys/types.h> 63# include <sys/types.h>
40# include <sys/socket.h> 64# include <sys/socket.h>
41# include <netinet/in.h> 65# include <netinet/in.h>
42# include <netinet/tcp.h> 66# include <netinet/tcp.h>
43# include <inttypes.h> 67# include <inttypes.h>
44#endif 68#endif
45 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
47 80
48#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
49 82
50#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
51#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
52 85
53#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
54 87
55#if 0 88/* mask out modifiers we are not interested in */
56# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
57#else 90
58# define PARACHUTE 0 91static AV *texture_av;
59#endif
60 92
61static struct 93static struct
62{ 94{
63#define GL_FUNC(ptr,name) ptr name; 95#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 96#include "glfunc.h"
65#undef GL_FUNC 97#undef GL_FUNC
66} gl; 98} gl;
67 99
100static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 101gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 102{
70 if (gl.BlendFuncSeparate) 103 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 104 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 105 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 106 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 107 else
75 glBlendFunc (sa, da); 108 glBlendFunc (sa, da);
76} 109}
77 110
111static GLuint
112gen_texture ()
113{
114 GLuint name;
115
116 if (AvFILL (texture_av) >= 0)
117 name = (GLuint)(size_t)av_pop (texture_av);
118 else
119 glGenTextures (1, &name);
120
121 return name;
122}
123
124static void
125del_texture (GLuint name)
126{
127 /* make a half-assed attempt at returning the memory used by the texture */
128 /* textures are frequently being reused by cfplus anyway */
129 /*glBindTexture (GL_TEXTURE_2D, name);*/
130 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
131 av_push (texture_av, (SV *)(size_t)name);
132 glDeleteTextures (1, &name);
133}
134
78#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
79 137
80#include "pango-font.c" 138#include "pango-font.c"
81#include "pango-fontmap.c" 139#include "pango-fontmap.c"
82#include "pango-render.c" 140#include "pango-render.c"
83 141
142typedef IV DC__Channel;
143typedef SDL_RWops *DC__RW;
84typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
85typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
86 146
87typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
88 148
89static int 149static int
90shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
91{ 151{
92 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
106 166
107typedef struct cf_layout { 167typedef struct cf_layout {
108 PangoLayout *pl; 168 PangoLayout *pl;
109 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
110 int base_height; 170 int base_height;
111 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
112} *CFPlus__Layout; 173} *DC__Layout;
113 174
114static CFPlus__Font default_font; 175static DC__Font default_font;
115static PangoContext *opengl_context; 176static PangoContext *opengl_context;
116static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
117 178
118static void 179static void
119substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
124#endif 185#endif
125 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
126} 187}
127 188
128static void 189static void
129layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
130{ 191{
131 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
132 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
133 */ 194 */
134 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
135 196
136 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
137 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
138 199
139 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
140} 201}
141 202
142static void 203static void
143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
144{ 205{
145 PangoRectangle rect; 206 PangoRectangle rect;
146 207
147 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
148 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
159 220
160typedef uint16_t tileid; 221typedef uint16_t tileid;
161typedef uint16_t faceid; 222typedef uint16_t faceid;
162 223
163typedef struct { 224typedef struct {
164 int name; 225 GLuint name;
165 int w, h; 226 int w, h;
166 float s, t; 227 float s, t;
167 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
168 tileid smoothtile; 229 tileid smoothtile;
169 uint8_t smoothlevel; 230 uint8_t smoothlevel;
187 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
188 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
189 250
190 int32_t rows; 251 int32_t rows;
191 maprow *row; 252 maprow *row;
192} *CFPlus__Map; 253} *DC__Map;
193 254
194static char * 255static char *
195prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
196{ 257{
197 char *p; 258 char *p;
235 self->texs *= 2; 296 self->texs *= 2;
236 } 297 }
237} 298}
238 299
239static maprow * 300static maprow *
240map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
241{ 302{
242 if (0 > y) 303 if (0 > y)
243 { 304 {
244 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
245 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
283 344
284 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
285} 346}
286 347
287static mapcell * 348static mapcell *
288map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
289{ 350{
290 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
291} 352}
292 353
293static void 354static void
294map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
295{ 356{
296 int r; 357 int r;
297 358
298 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
299 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
306 self->oy = 0; 367 self->oy = 0;
307 self->row = 0; 368 self->row = 0;
308 self->rows = 0; 369 self->rows = 0;
309} 370}
310 371
372#define CELL_CLEAR(cell) \
373 do { \
374 (cell)->darkness = 0; \
375 (cell)->stat_hp = 0; \
376 (cell)->flags = 0; \
377 (cell)->player = 0; \
378 } while (0)
379
311static void 380static void
312map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 381map_blank (DC__Map self, int x0, int y0, int w, int h)
313{ 382{
314 int x, y; 383 int x, y;
315 maprow *row; 384 maprow *row;
316 mapcell *cell; 385 mapcell *cell;
317 386
329 if (x >= row->c1) 398 if (x >= row->c1)
330 break; 399 break;
331 400
332 cell = row->col + x - row->c0; 401 cell = row->col + x - row->c0;
333 402
334 cell->darkness = 0; 403 CELL_CLEAR (cell);
335 cell->stat_hp = 0;
336 cell->flags = 0;
337 cell->player = 0;
338 } 404 }
339 } 405 }
340} 406}
341 407
342typedef struct { 408typedef struct {
396 n |= n >> 16; 462 n |= n >> 16;
397 463
398 return n + 1; 464 return n + 1;
399} 465}
400 466
467static unsigned int
468popcount (unsigned int n)
469{
470 n -= (n >> 1) & 0x55555555U;
471 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
472 n = ((n >> 4) + n) & 0x0f0f0f0fU;
473 n *= 0x01010101U;
474
475 return n >> 24;
476}
477
401/* SDL should provide this, really. */ 478/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300 479#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314 480#define SDLK_MODIFIER_MAX 314
404 481
405static AV *texture_av; 482/******************************************************************************/
406 483
407MODULE = CFPlus PACKAGE = CFPlus 484static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
485static GV *hover_gv;
486
487static int
488within_widget (SV *widget, NV x, NV y)
489{
490 HV *self;
491 SV **svp;
492 NV wx, ww, wy, wh;
493
494 if (!SvROK (widget))
495 return 0;
496
497 self = (HV *)SvRV (widget);
498
499 if (SvTYPE (self) != SVt_PVHV)
500 return 0;
501
502 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
503 if (y < wy)
504 return 0;
505
506 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
507 if (y >= wy + wh)
508 return 0;
509
510 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
511 if (x < wx)
512 return 0;
513
514 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
515 if (x >= wx + ww)
516 return 0;
517
518 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
519 if (!svp || !SvTRUE (*svp))
520 return 0;
521
522 return 1;
523}
524
525MODULE = Deliantra::Client PACKAGE = DC
408 526
409PROTOTYPES: ENABLE 527PROTOTYPES: ENABLE
410 528
411BOOT: 529BOOT:
412{ 530{
413 texture_av = newAV ();
414 AvREAL_off (texture_av);
415
416 HV *stash = gv_stashpv ("CFPlus", 1); 531 HV *stash = gv_stashpv ("DC", 1);
417 static const struct { 532 static const struct {
418 const char *name; 533 const char *name;
419 IV iv; 534 IV iv;
420 } *civ, const_iv[] = { 535 } *civ, const_iv[] = {
421# define const_iv(name) { # name, (IV)name } 536# define const_iv(name) { # name, (IV)name }
443 558
444 const_iv (SDL_APPINPUTFOCUS), 559 const_iv (SDL_APPINPUTFOCUS),
445 const_iv (SDL_APPMOUSEFOCUS), 560 const_iv (SDL_APPMOUSEFOCUS),
446 const_iv (SDL_APPACTIVE), 561 const_iv (SDL_APPACTIVE),
447 562
563 const_iv (SDLK_FIRST),
564 const_iv (SDLK_LAST),
448 const_iv (SDLK_KP0), 565 const_iv (SDLK_KP0),
449 const_iv (SDLK_KP1), 566 const_iv (SDLK_KP1),
450 const_iv (SDLK_KP2), 567 const_iv (SDLK_KP2),
451 const_iv (SDLK_KP3), 568 const_iv (SDLK_KP3),
452 const_iv (SDLK_KP4), 569 const_iv (SDLK_KP4),
524 const_iv (KMOD_LMETA), 641 const_iv (KMOD_LMETA),
525 const_iv (KMOD_RMETA), 642 const_iv (KMOD_RMETA),
526 const_iv (KMOD_NUM), 643 const_iv (KMOD_NUM),
527 const_iv (KMOD_CAPS), 644 const_iv (KMOD_CAPS),
528 const_iv (KMOD_MODE), 645 const_iv (KMOD_MODE),
646
647 const_iv (MIX_DEFAULT_FORMAT),
648
649 const_iv (SDL_INIT_TIMER),
650 const_iv (SDL_INIT_AUDIO),
651 const_iv (SDL_INIT_VIDEO),
652 const_iv (SDL_INIT_CDROM),
653 const_iv (SDL_INIT_JOYSTICK),
654 const_iv (SDL_INIT_EVERYTHING),
655 const_iv (SDL_INIT_NOPARACHUTE),
656 const_iv (SDL_INIT_EVENTTHREAD),
657
658 const_iv (SDL_GL_RED_SIZE),
659 const_iv (SDL_GL_GREEN_SIZE),
660 const_iv (SDL_GL_BLUE_SIZE),
661 const_iv (SDL_GL_ALPHA_SIZE),
662 const_iv (SDL_GL_DOUBLEBUFFER),
663 const_iv (SDL_GL_BUFFER_SIZE),
664 const_iv (SDL_GL_DEPTH_SIZE),
665 const_iv (SDL_GL_STENCIL_SIZE),
666 const_iv (SDL_GL_ACCUM_RED_SIZE),
667 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
668 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
669 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
670 const_iv (SDL_GL_STEREO),
671 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
672 const_iv (SDL_GL_MULTISAMPLESAMPLES),
673 const_iv (SDL_GL_ACCELERATED_VISUAL),
674 const_iv (SDL_GL_SWAP_CONTROL)
529# undef const_iv 675# undef const_iv
530 }; 676 };
531 677
532 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
533 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
551 697
552NV floor (NV x) 698NV floor (NV x)
553 699
554NV ceil (NV x) 700NV ceil (NV x)
555 701
702IV minpot (UV n)
703
704IV popcount (UV n)
705
556void 706void
557pango_init () 707pango_init ()
558 CODE: 708 CODE:
559{ 709{
560 opengl_fontmap = pango_opengl_font_map_new (); 710 opengl_fontmap = pango_opengl_font_map_new ();
561 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 711 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
562 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 712 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
713 /*pango_context_set_font_description (opengl_context, default_font);*/
714#if PANGO_VERSION_CHECK (1, 15, 2)
715 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
716 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
717#endif
563} 718}
564 719
565int 720char *SDL_GetError ()
566SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
567 721
568void 722int SDL_Init (U32 flags)
723
724int SDL_InitSubSystem (U32 flags)
725
726void SDL_QuitSubSystem (U32 flags)
727
569SDL_Quit () 728void SDL_Quit ()
570 729
730int SDL_GL_SetAttribute (int attr, int value)
731
732int SDL_GL_GetAttribute (int attr)
733 CODE:
734 if (SDL_GL_GetAttribute (attr, &RETVAL))
735 XSRETURN_UNDEF;
736 OUTPUT:
737 RETVAL
738
571void 739void
572SDL_ListModes () 740SDL_ListModes (int rgb, int alpha)
573 PPCODE: 741 PPCODE:
574{ 742{
575 SDL_Rect **m; 743 SDL_Rect **m;
576 744
577 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 745 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
578 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 746 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
579 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 747 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
580 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 748 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
581 749
582 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 750 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
583 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
584 752
585 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 753 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
586 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 754 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
587 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 755 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
588 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 756 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
589 757
590 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 758 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
591#if SDL_VERSION_ATLEAST(1,2,10)
592 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
593 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 759 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
594#endif
595
596 SDL_EnableUNICODE (1);
597 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
598 760
599 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 761 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
600 762
601 if (m && m != (SDL_Rect **)-1) 763 if (m && m != (SDL_Rect **)-1)
602 while (*m) 764 while (*m)
603 { 765 {
766 if ((*m)->w >= 400 && (*m)->h >= 300)
767 {
604 AV *av = newAV (); 768 AV *av = newAV ();
605 av_push (av, newSViv ((*m)->w)); 769 av_push (av, newSViv ((*m)->w));
606 av_push (av, newSViv ((*m)->h)); 770 av_push (av, newSViv ((*m)->h));
771 av_push (av, newSViv (rgb));
772 av_push (av, newSViv (alpha));
607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 773 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
774 }
608 775
609 ++m; 776 ++m;
610 } 777 }
611} 778}
612 779
613char *
614SDL_GetError ()
615
616int 780int
617SDL_SetVideoMode (int w, int h, int fullscreen) 781SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
618 CODE: 782 CODE:
783{
784 SDL_EnableUNICODE (1);
785 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
786
787 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
788 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
789 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
790 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
791
619 RETVAL = !!SDL_SetVideoMode ( 792 RETVAL = !!SDL_SetVideoMode (
620 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 793 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
621 ); 794 );
795
622 if (RETVAL) 796 if (RETVAL)
623 { 797 {
624 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 798 av_clear (texture_av);
799
800 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
625# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 801#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
626# include "glfunc.h" 802#include "glfunc.h"
627# undef GL_FUNC 803#undef GL_FUNC
628 } 804 }
805}
629 OUTPUT: 806 OUTPUT:
630 RETVAL 807 RETVAL
631 808
632void 809void
633SDL_GL_SwapBuffers () 810SDL_GL_SwapBuffers ()
634 811
635char * 812char *
636SDL_GetKeyName (int sym) 813SDL_GetKeyName (int sym)
637 814
815int
816SDL_GetAppState ()
817
818int
819SDL_GetModState ()
820
638void 821void
639SDL_PollEvent () 822poll_events ()
640 PPCODE: 823 PPCODE:
641{ 824{
642 SDL_Event ev; 825 SDL_Event ev;
643 826
644 while (SDL_PollEvent (&ev)) 827 SDL_PumpEvents ();
828 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
645 { 829 {
646 HV *hv = newHV (); 830 HV *hv = newHV ();
647 hv_store (hv, "type", 4, newSViv (ev.type), 0); 831 hv_store (hv, "type", 4, newSViv (ev.type), 0);
648 832
649 switch (ev.type) 833 switch (ev.type)
650 { 834 {
651 case SDL_KEYDOWN: 835 case SDL_KEYDOWN:
652 case SDL_KEYUP: 836 case SDL_KEYUP:
653 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 837 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
654 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 838 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
655 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 839 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
656 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 840 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
657 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 841 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
658 break; 842 break;
659 843
660 case SDL_ACTIVEEVENT: 844 case SDL_ACTIVEEVENT:
661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 845 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
662 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 846 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
663 break; 847 break;
664 848
665 case SDL_MOUSEMOTION: 849 case SDL_MOUSEMOTION:
850 {
851 int state = ev.motion.state;
852 int x = ev.motion.x;
853 int y = ev.motion.y;
854 int xrel = ev.motion.xrel;
855 int yrel = ev.motion.yrel;
856
857 /* do simplistic event compression */
858 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
859 && state == ev.motion.state)
860 {
861 xrel += ev.motion.xrel;
862 yrel += ev.motion.yrel;
863 x = ev.motion.x;
864 y = ev.motion.y;
865 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
866 }
867
666 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 868 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
667
668 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 869 hv_store (hv, "state", 5, newSViv (state), 0);
669 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 870 hv_store (hv, "x", 1, newSViv (x), 0);
670 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 871 hv_store (hv, "y", 1, newSViv (y), 0);
671 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 872 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
672 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 873 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
874 }
673 break; 875 break;
674 876
675 case SDL_MOUSEBUTTONDOWN: 877 case SDL_MOUSEBUTTONDOWN:
676 case SDL_MOUSEBUTTONUP: 878 case SDL_MOUSEBUTTONUP:
677 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 879 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
678 880
679 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 881 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
680 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 882 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
681 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 883 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
682 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 884 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
687 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 889 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
688 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 890 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
689 break; 891 break;
690 } 892 }
691 893
692 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 894 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
693 } 895 }
694} 896}
695 897
696int 898int
697Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 899Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
698 POSTCALL: 900 POSTCALL:
699 Mix_HookMusicFinished (music_finished); 901 Mix_HookMusicFinished (music_finished);
700 Mix_ChannelFinished (channel_finished); 902 Mix_ChannelFinished (channel_finished);
701 903
702void 904void
905Mix_QuerySpec ()
906 PPCODE:
907{
908 int freq, channels;
909 Uint16 format;
910
911 if (Mix_QuerySpec (&freq, &format, &channels))
912 {
913 EXTEND (SP, 3);
914 PUSHs (sv_2mortal (newSViv (freq)));
915 PUSHs (sv_2mortal (newSViv (format)));
916 PUSHs (sv_2mortal (newSViv (channels)));
917 }
918}
919
920void
703Mix_CloseAudio () 921Mix_CloseAudio ()
704 922
705int 923int
706Mix_AllocateChannels (int numchans = -1) 924Mix_AllocateChannels (int numchans = -1)
925
926const char *
927Mix_GetError ()
707 928
708void 929void
709lowdelay (int fd, int val = 1) 930lowdelay (int fd, int val = 1)
710 CODE: 931 CODE:
711 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 932 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
737 } 958 }
738 } 959 }
739#endif 960#endif
740} 961}
741 962
742void 963int
743add_font (char *file) 964add_font (char *file)
744 CODE: 965 CODE:
745 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 966 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
967 OUTPUT:
968 RETVAL
746 969
747void 970void
748load_image_inline (SV *image_) 971load_image_inline (SV *image_)
749 ALIAS: 972 ALIAS:
750 load_image_file = 1 973 load_image_file = 1
753 STRLEN image_len; 976 STRLEN image_len;
754 char *image = (char *)SvPVbyte (image_, image_len); 977 char *image = (char *)SvPVbyte (image_, image_len);
755 SDL_Surface *surface, *surface2; 978 SDL_Surface *surface, *surface2;
756 SDL_PixelFormat fmt; 979 SDL_PixelFormat fmt;
757 SDL_RWops *rw = ix 980 SDL_RWops *rw = ix
758 ? SDL_RWFromFile (image, "r") 981 ? SDL_RWFromFile (image, "rb")
759 : SDL_RWFromConstMem (image, image_len); 982 : SDL_RWFromConstMem (image, image_len);
760 983
761 if (!rw) 984 if (!rw)
762 croak ("load_image: %s", SDL_GetError ()); 985 croak ("load_image: %s", SDL_GetError ());
763 986
836void 1059void
837error (char *message) 1060error (char *message)
838 CODE: 1061 CODE:
839 fprintf (stderr, "ERROR: %s\n", message); 1062 fprintf (stderr, "ERROR: %s\n", message);
840#ifdef _WIN32 1063#ifdef _WIN32
841 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
842#endif 1065#endif
843 1066
844void 1067void
845fatal (char *message) 1068fatal (char *message)
846 CODE: 1069 CODE:
847 fprintf (stderr, "FATAL: %s\n", message); 1070 fprintf (stderr, "FATAL: %s\n", message);
848#ifdef _WIN32 1071#ifdef _WIN32
849 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1072 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
850#endif 1073#endif
851 _exit (1); 1074 _exit (1);
852 1075
853void 1076void
854_exit (int retval = 0) 1077_exit (int retval = 0)
857 ExitThread (retval); // unclean, please beam me up 1080 ExitThread (retval); // unclean, please beam me up
858#else 1081#else
859 _exit (retval); 1082 _exit (retval);
860#endif 1083#endif
861 1084
862MODULE = CFPlus PACKAGE = CFPlus::Font 1085void
1086debug ()
1087 CODE:
1088{
1089#if DEBUG
1090 VALGRIND_DO_LEAK_CHECK;
1091#endif
1092}
863 1093
864CFPlus::Font 1094MODULE = Deliantra::Client PACKAGE = DC::Font
1095
1096PROTOTYPES: DISABLE
1097
1098DC::Font
865new_from_file (SV *class, char *path, int id = 0) 1099new_from_file (SV *class, char *path, int id = 0)
866 CODE: 1100 CODE:
867{ 1101{
868 int count; 1102 int count;
869 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1103 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
872} 1106}
873 OUTPUT: 1107 OUTPUT:
874 RETVAL 1108 RETVAL
875 1109
876void 1110void
877DESTROY (CFPlus::Font self) 1111DESTROY (DC::Font self)
878 CODE: 1112 CODE:
879 pango_font_description_free (self); 1113 pango_font_description_free (self);
880 1114
881void 1115void
882make_default (CFPlus::Font self) 1116make_default (DC::Font self)
1117 PROTOTYPE: $
883 CODE: 1118 CODE:
884 default_font = self; 1119 default_font = self;
885 1120
886MODULE = CFPlus PACKAGE = CFPlus::Layout 1121MODULE = Deliantra::Client PACKAGE = DC::Layout
887 1122
1123PROTOTYPES: DISABLE
1124
888void 1125void
889reset_glyph_cache () 1126glyph_cache_backup ()
1127 PROTOTYPE:
890 CODE: 1128 CODE:
1129 tc_backup ();
1130
1131void
1132glyph_cache_restore ()
1133 PROTOTYPE:
1134 CODE:
891 tc_clear (); 1135 tc_restore ();
892 1136
893CFPlus::Layout 1137DC::Layout
894new (SV *class) 1138new (SV *class)
895 CODE: 1139 CODE:
896 New (0, RETVAL, 1, struct cf_layout); 1140 New (0, RETVAL, 1, struct cf_layout);
897 1141
898 RETVAL->pl = pango_layout_new (opengl_context); 1142 RETVAL->pl = pango_layout_new (opengl_context);
900 RETVAL->g = 1.; 1144 RETVAL->g = 1.;
901 RETVAL->b = 1.; 1145 RETVAL->b = 1.;
902 RETVAL->a = 1.; 1146 RETVAL->a = 1.;
903 RETVAL->base_height = MIN_FONT_HEIGHT; 1147 RETVAL->base_height = MIN_FONT_HEIGHT;
904 RETVAL->font = 0; 1148 RETVAL->font = 0;
1149 RETVAL->rc = rc_alloc ();
905 1150
906 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1151 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
907 layout_update_font (RETVAL); 1152 layout_update_font (RETVAL);
908 OUTPUT: 1153 OUTPUT:
909 RETVAL 1154 RETVAL
910 1155
911void 1156void
912DESTROY (CFPlus::Layout self) 1157DESTROY (DC::Layout self)
913 CODE: 1158 CODE:
914 g_object_unref (self->pl); 1159 g_object_unref (self->pl);
1160 rc_free (self->rc);
915 Safefree (self); 1161 Safefree (self);
916 1162
917void 1163void
918set_text (CFPlus::Layout self, SV *text_) 1164set_text (DC::Layout self, SV *text_)
919 CODE: 1165 CODE:
920{ 1166{
921 STRLEN textlen; 1167 STRLEN textlen;
922 char *text = SvPVutf8 (text_, textlen); 1168 char *text = SvPVutf8 (text_, textlen);
923 1169
924 pango_layout_set_text (self->pl, text, textlen); 1170 pango_layout_set_text (self->pl, text, textlen);
925} 1171}
926 1172
927void 1173void
928set_markup (CFPlus::Layout self, SV *text_) 1174set_markup (DC::Layout self, SV *text_)
929 CODE: 1175 CODE:
930{ 1176{
931 STRLEN textlen; 1177 STRLEN textlen;
932 char *text = SvPVutf8 (text_, textlen); 1178 char *text = SvPVutf8 (text_, textlen);
933 1179
934 pango_layout_set_markup (self->pl, text, textlen); 1180 pango_layout_set_markup (self->pl, text, textlen);
935} 1181}
936 1182
937void 1183void
938set_shapes (CFPlus::Layout self, ...) 1184set_shapes (DC::Layout self, ...)
939 CODE: 1185 CODE:
940{ 1186{
941 PangoAttrList *attrs = 0; 1187 PangoAttrList *attrs = 0;
942 const char *text = pango_layout_get_text (self->pl); 1188 const char *text = pango_layout_get_text (self->pl);
943 const char *pos = text; 1189 const char *pos = text;
978 if (attrs) 1224 if (attrs)
979 pango_layout_set_attributes (self->pl, attrs); 1225 pango_layout_set_attributes (self->pl, attrs);
980} 1226}
981 1227
982void 1228void
983get_shapes (CFPlus::Layout self) 1229get_shapes (DC::Layout self)
984 PPCODE: 1230 PPCODE:
985{ 1231{
986 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1232 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
987 1233
988 do 1234 do
989 { 1235 {
990 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1236 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
991 1237
992 if (run && shape_attr_p (run)) 1238 if (run && shape_attr_p (run))
993 { 1239 {
994 PangoRectangle extents; 1240 PangoRectangle extents;
995 pango_layout_iter_get_run_extents (iter, 0, &extents); 1241 pango_layout_iter_get_run_extents (iter, 0, &extents);
1003 1249
1004 pango_layout_iter_free (iter); 1250 pango_layout_iter_free (iter);
1005} 1251}
1006 1252
1007int 1253int
1008has_wrapped (CFPlus::Layout self) 1254has_wrapped (DC::Layout self)
1009 CODE: 1255 CODE:
1010{ 1256{
1011 int lines = 1; 1257 int lines = 1;
1012 const char *text = pango_layout_get_text (self->pl); 1258 const char *text = pango_layout_get_text (self->pl);
1013 1259
1018} 1264}
1019 OUTPUT: 1265 OUTPUT:
1020 RETVAL 1266 RETVAL
1021 1267
1022SV * 1268SV *
1023get_text (CFPlus::Layout self) 1269get_text (DC::Layout self)
1024 CODE: 1270 CODE:
1025 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1271 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1026 sv_utf8_decode (RETVAL); 1272 sv_utf8_decode (RETVAL);
1027 OUTPUT: 1273 OUTPUT:
1028 RETVAL 1274 RETVAL
1029 1275
1030void 1276void
1031set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1277set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1032 CODE: 1278 CODE:
1033 self->r = r; 1279 self->r = r;
1034 self->g = g; 1280 self->g = g;
1035 self->b = b; 1281 self->b = b;
1036 self->a = a; 1282 self->a = a;
1037 1283
1038void 1284void
1039set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1285set_font (DC::Layout self, DC::Font font = 0)
1040 CODE: 1286 CODE:
1041 if (self->font != font) 1287 if (self->font != font)
1042 { 1288 {
1043 self->font = font; 1289 self->font = font;
1044 layout_update_font (self); 1290 layout_update_font (self);
1045 } 1291 }
1046 1292
1047void 1293void
1048set_height (CFPlus::Layout self, int base_height) 1294set_height (DC::Layout self, int base_height)
1049 CODE: 1295 CODE:
1050 if (self->base_height != base_height) 1296 if (self->base_height != base_height)
1051 { 1297 {
1052 self->base_height = base_height; 1298 self->base_height = base_height;
1053 layout_update_font (self); 1299 layout_update_font (self);
1054 } 1300 }
1055 1301
1056void 1302void
1057set_width (CFPlus::Layout self, int max_width = -1) 1303set_width (DC::Layout self, int max_width = -1)
1058 CODE: 1304 CODE:
1059 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1305 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1060 1306
1061void 1307void
1062set_indent (CFPlus::Layout self, int indent) 1308set_indent (DC::Layout self, int indent)
1063 CODE: 1309 CODE:
1064 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1310 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1065 1311
1066void 1312void
1067set_spacing (CFPlus::Layout self, int spacing) 1313set_spacing (DC::Layout self, int spacing)
1068 CODE: 1314 CODE:
1069 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1315 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1070 1316
1071void 1317void
1072set_ellipsise (CFPlus::Layout self, int ellipsise) 1318set_ellipsise (DC::Layout self, int ellipsise)
1073 CODE: 1319 CODE:
1074 pango_layout_set_ellipsize (self->pl, 1320 pango_layout_set_ellipsize (self->pl,
1075 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1321 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1076 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1322 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1077 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1323 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1078 : PANGO_ELLIPSIZE_NONE 1324 : PANGO_ELLIPSIZE_NONE
1079 ); 1325 );
1080 1326
1081void 1327void
1082set_single_paragraph_mode (CFPlus::Layout self, int spm) 1328set_single_paragraph_mode (DC::Layout self, int spm)
1083 CODE: 1329 CODE:
1084 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1330 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1085 1331
1086void 1332void
1087size (CFPlus::Layout self) 1333size (DC::Layout self)
1088 PPCODE: 1334 PPCODE:
1089{ 1335{
1090 int w, h; 1336 int w, h;
1091 1337
1092 layout_get_pixel_size (self, &w, &h); 1338 layout_get_pixel_size (self, &w, &h);
1095 PUSHs (sv_2mortal (newSViv (w))); 1341 PUSHs (sv_2mortal (newSViv (w)));
1096 PUSHs (sv_2mortal (newSViv (h))); 1342 PUSHs (sv_2mortal (newSViv (h)));
1097} 1343}
1098 1344
1099int 1345int
1100descent (CFPlus::Layout self) 1346descent (DC::Layout self)
1101 CODE: 1347 CODE:
1102{ 1348{
1103 PangoRectangle rect; 1349 PangoRectangle rect;
1104 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1350 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1105 pango_layout_line_get_pixel_extents (line, 0, &rect); 1351 pango_layout_line_get_pixel_extents (line, 0, &rect);
1106 RETVAL = PANGO_DESCENT (rect); 1352 RETVAL = PANGO_DESCENT (rect);
1107} 1353}
1108 OUTPUT: 1354 OUTPUT:
1109 RETVAL 1355 RETVAL
1110 1356
1111int 1357int
1112xy_to_index (CFPlus::Layout self, int x, int y) 1358xy_to_index (DC::Layout self, int x, int y)
1113 CODE: 1359 CODE:
1114{ 1360{
1115 int index, trailing; 1361 int index, trailing;
1116 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1362 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1117 RETVAL = index + trailing; 1363 RETVAL = index + trailing;
1118} 1364}
1119 OUTPUT: 1365 OUTPUT:
1120 RETVAL 1366 RETVAL
1121 1367
1122void 1368void
1123cursor_pos (CFPlus::Layout self, int index) 1369cursor_pos (DC::Layout self, int index)
1124 PPCODE: 1370 PPCODE:
1125{ 1371{
1126 PangoRectangle strong_pos; 1372 PangoRectangle pos;
1127 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1373 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1128 1374
1129 EXTEND (SP, 3); 1375 EXTEND (SP, 3);
1130 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1376 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1131 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1377 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1132 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1378 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1133} 1379}
1134 1380
1135void 1381void
1136index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1382index_to_line_x (DC::Layout self, int index, int trailing = 0)
1137 PPCODE: 1383 PPCODE:
1138{ 1384{
1139 int line, x; 1385 int line, x;
1140 1386
1141 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1387 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1388#if !PANGO_VERSION_CHECK (1, 17, 3)
1142 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1389 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1143 1390 --line;
1391#endif
1144 EXTEND (SP, 2); 1392 EXTEND (SP, 2);
1145 PUSHs (sv_2mortal (newSViv (line - 1))); 1393 PUSHs (sv_2mortal (newSViv (line)));
1146 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1394 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1147} 1395}
1148 1396
1149void 1397void
1150line_x_to_index (CFPlus::Layout self, int line, int x) 1398line_x_to_index (DC::Layout self, int line, int x)
1151 PPCODE: 1399 PPCODE:
1152{ 1400{
1153 PangoLayoutLine *lp; 1401 PangoLayoutLine *lp;
1154 int index, trailing; 1402 int index, trailing;
1155 1403
1156 if (line < 0) 1404 if (line < 0)
1157 XSRETURN_EMPTY; 1405 XSRETURN_EMPTY;
1158 1406
1159 if (!(lp = pango_layout_get_line (self->pl, line))) 1407 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1160 XSRETURN_EMPTY; /* do better */ 1408 XSRETURN_EMPTY; /* do better */
1161 1409
1162 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1410 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1163 1411
1164 EXTEND (SP, 2); 1412 EXTEND (SP, 2);
1170 PUSHs (sv_2mortal (newSViv (trailing))); 1418 PUSHs (sv_2mortal (newSViv (trailing)));
1171 } 1419 }
1172} 1420}
1173 1421
1174void 1422void
1175render (CFPlus::Layout self, float x, float y, int flags = 0) 1423render (DC::Layout self, float x, float y, int flags = 0)
1176 PPCODE: 1424 CODE:
1425 rc_clear (self->rc);
1177 pango_opengl_render_layout_subpixel ( 1426 pango_opengl_render_layout_subpixel (
1178 self->pl, 1427 self->pl,
1428 self->rc,
1179 x * PANGO_SCALE, y * PANGO_SCALE, 1429 x * PANGO_SCALE, y * PANGO_SCALE,
1180 self->r, self->g, self->b, self->a, 1430 self->r, self->g, self->b, self->a,
1181 flags 1431 flags
1182 ); 1432 );
1433 // we assume that context_change actually clears/frees stuff
1434 // and does not do any recomputation...
1435 pango_layout_context_changed (self->pl);
1183 1436
1184MODULE = CFPlus PACKAGE = CFPlus::Texture
1185
1186void 1437void
1187pad2pot (SV *data_, SV *w_, SV *h_) 1438draw (DC::Layout self)
1188 CODE: 1439 CODE:
1189{ 1440{
1190 int ow = SvIV (w_); 1441 glEnable (GL_TEXTURE_2D);
1191 int oh = SvIV (h_); 1442 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1443 glEnable (GL_BLEND);
1444 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1445 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1446 glEnable (GL_ALPHA_TEST);
1447 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1192 1448
1193 if (ow && oh) 1449 rc_draw (self->rc);
1450
1451 glDisable (GL_ALPHA_TEST);
1452 glDisable (GL_BLEND);
1453 glDisable (GL_TEXTURE_2D);
1454}
1455
1456MODULE = Deliantra::Client PACKAGE = DC::Texture
1457
1458PROTOTYPES: ENABLE
1459
1460void
1461pad (SV *data_, int ow, int oh, int nw, int nh)
1462 CODE:
1463{
1464 if ((nw != ow || nh != oh) && SvOK (data_))
1194 { 1465 {
1195 int nw = minpot (ow);
1196 int nh = minpot (oh);
1197
1198 if (nw != ow || nh != oh)
1199 {
1200 if (SvOK (data_))
1201 {
1202 STRLEN datalen; 1466 STRLEN datalen;
1203 char *data = SvPVbyte (data_, datalen); 1467 char *data = SvPVbyte (data_, datalen);
1204 int bpp = datalen / (ow * oh); 1468 int bpp = datalen / (ow * oh);
1205 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1469 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1206 1470
1207 SvPOK_only (result_); 1471 SvPOK_only (result_);
1208 SvCUR_set (result_, nw * nh * bpp); 1472 SvCUR_set (result_, nw * nh * bpp);
1209 1473
1210 memset (SvPVX (result_), 0, nw * nh * bpp); 1474 memset (SvPVX (result_), 0, nw * nh * bpp);
1211 while (oh--) 1475 while (oh--)
1212 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1476 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1213 1477
1214 sv_setsv (data_, result_); 1478 sv_setsv (data_, result_);
1215 }
1216
1217 sv_setiv (w_, nw);
1218 sv_setiv (h_, nh);
1219 }
1220 } 1479 }
1221} 1480}
1222 1481
1223void 1482void
1224draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1483draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1230{ 1489{
1231 HV *hv = (HV *)SvRV (self); 1490 HV *hv = (HV *)SvRV (self);
1232 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1491 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1233 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1492 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1234 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1493 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1494
1495 if (name <= 0)
1496 XSRETURN_EMPTY;
1235 1497
1236 if (items < 5) 1498 if (items < 5)
1237 { 1499 {
1238 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1500 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1239 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1501 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1267 glDisable (GL_ALPHA_TEST); 1529 glDisable (GL_ALPHA_TEST);
1268 glDisable (GL_BLEND); 1530 glDisable (GL_BLEND);
1269 } 1531 }
1270} 1532}
1271 1533
1272MODULE = CFPlus PACKAGE = CFPlus::Map 1534IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1535 CODE:
1536{
1537 GLint width;
1538 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1539 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1540 RETVAL = width > 0;
1541}
1542 OUTPUT:
1543 RETVAL
1273 1544
1274CFPlus::Map 1545MODULE = Deliantra::Client PACKAGE = DC::Map
1546
1547PROTOTYPES: DISABLE
1548
1549DC::Map
1275new (SV *class) 1550new (SV *class)
1276 CODE: 1551 CODE:
1277 New (0, RETVAL, 1, struct map); 1552 New (0, RETVAL, 1, struct map);
1278 RETVAL->x = 0; 1553 RETVAL->x = 0;
1279 RETVAL->y = 0; 1554 RETVAL->y = 0;
1287 RETVAL->row = 0; 1562 RETVAL->row = 0;
1288 OUTPUT: 1563 OUTPUT:
1289 RETVAL 1564 RETVAL
1290 1565
1291void 1566void
1292DESTROY (CFPlus::Map self) 1567DESTROY (DC::Map self)
1293 CODE: 1568 CODE:
1294{ 1569{
1295 map_clear (self); 1570 map_clear (self);
1296 Safefree (self->face2tile); 1571 Safefree (self->face2tile);
1297 Safefree (self->tex); 1572 Safefree (self->tex);
1298 Safefree (self); 1573 Safefree (self);
1299} 1574}
1300 1575
1301void 1576void
1302resize (CFPlus::Map self, int map_width, int map_height) 1577resize (DC::Map self, int map_width, int map_height)
1303 CODE: 1578 CODE:
1304 self->w = map_width; 1579 self->w = map_width;
1305 self->h = map_height; 1580 self->h = map_height;
1306 1581
1307void 1582void
1308clear (CFPlus::Map self) 1583clear (DC::Map self)
1309 CODE: 1584 CODE:
1310 map_clear (self); 1585 map_clear (self);
1311 1586
1312void 1587void
1313set_tileid (CFPlus::Map self, int face, int tile) 1588set_tileid (DC::Map self, int face, int tile)
1314 CODE: 1589 CODE:
1315{ 1590{
1316 need_facenum (self, face); self->face2tile [face] = tile; 1591 need_facenum (self, face); self->face2tile [face] = tile;
1317 need_texid (self, tile); 1592 need_texid (self, tile);
1318} 1593}
1319 1594
1320void 1595void
1321set_smooth (CFPlus::Map self, int face, int smooth, int level) 1596set_smooth (DC::Map self, int face, int smooth, int level)
1322 CODE: 1597 CODE:
1323{ 1598{
1324 tileid texid; 1599 tileid texid;
1325 maptex *tex; 1600 maptex *tex;
1326 1601
1339 tex->smoothtile = self->face2tile [smooth]; 1614 tex->smoothtile = self->face2tile [smooth];
1340 tex->smoothlevel = level; 1615 tex->smoothlevel = level;
1341} 1616}
1342 1617
1343void 1618void
1344set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1619set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1345 CODE: 1620 CODE:
1346{ 1621{
1347 need_texid (self, texid); 1622 need_texid (self, texid);
1348 1623
1349 { 1624 {
1369 // from transparent color bleeding and ugly wrapping effects. 1644 // from transparent color bleeding and ugly wrapping effects.
1370 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1645 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1371} 1646}
1372 1647
1373int 1648int
1374ox (CFPlus::Map self) 1649ox (DC::Map self)
1375 ALIAS: 1650 ALIAS:
1376 oy = 1 1651 oy = 1
1377 x = 2 1652 x = 2
1378 y = 3 1653 y = 3
1379 w = 4 1654 w = 4
1390 } 1665 }
1391 OUTPUT: 1666 OUTPUT:
1392 RETVAL 1667 RETVAL
1393 1668
1394void 1669void
1395scroll (CFPlus::Map self, int dx, int dy) 1670scroll (DC::Map self, int dx, int dy)
1396 CODE: 1671 CODE:
1397{ 1672{
1398 if (dx > 0) 1673 if (dx > 0)
1399 map_blank (self, self->x, self->y, dx, self->h); 1674 map_blank (self, self->x, self->y, dx, self->h);
1400 else if (dx < 0) 1675 else if (dx < 0)
1401 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1676 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1402 1677
1403 if (dy > 0) 1678 if (dy > 0)
1404 map_blank (self, self->x, self->y, self->w, dy); 1679 map_blank (self, self->x, self->y, self->w, dy);
1405 else if (dy < 0) 1680 else if (dy < 0)
1406 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1681 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1407 1682
1408 self->ox += dx; self->x += dx; 1683 self->ox += dx; self->x += dx;
1409 self->oy += dy; self->y += dy; 1684 self->oy += dy; self->y += dy;
1410 1685
1411 while (self->y < 0) 1686 while (self->y < 0)
1415 self->rows += MAP_EXTEND_Y; 1690 self->rows += MAP_EXTEND_Y;
1416 self->y += MAP_EXTEND_Y; 1691 self->y += MAP_EXTEND_Y;
1417 } 1692 }
1418} 1693}
1419 1694
1420void 1695SV *
1421map1a_update (CFPlus::Map self, SV *data_, int extmap) 1696map1a_update (DC::Map self, SV *data_, int extmap)
1422 CODE: 1697 CODE:
1423{ 1698{
1424 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1699 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1425 uint8_t *data_end = (uint8_t *)SvEND (data_); 1700 uint8_t *data_end = (uint8_t *)SvEND (data_);
1426 mapcell *cell; 1701 mapcell *cell;
1427 int x, y, flags; 1702 int x, y, z, flags;
1703 AV *missing = newAV ();
1704 RETVAL = newRV_noinc ((SV *)missing);
1428 1705
1429 while (data < data_end - 1) 1706 while (data < data_end - 1)
1430 { 1707 {
1431 flags = (data [0] << 8) + data [1]; data += 2; 1708 flags = (data [0] << 8) + data [1]; data += 2;
1432 1709
1452 uint8_t ext, cmd; 1729 uint8_t ext, cmd;
1453 1730
1454 do 1731 do
1455 { 1732 {
1456 ext = *data++; 1733 ext = *data++;
1457 cmd = ext & 0x3f; 1734 cmd = ext & 0x7f;
1458 1735
1459 if (cmd < 4) 1736 if (cmd < 4)
1460 cell->darkness = 255 - ext * 64 + 1; 1737 cell->darkness = 255 - ext * 64 + 1;
1461 else if (cmd == 5) // health 1738 else if (cmd == 5) // health
1462 { 1739 {
1465 } 1742 }
1466 else if (cmd == 6) // monster width 1743 else if (cmd == 6) // monster width
1467 cell->stat_width = *data++ + 1; 1744 cell->stat_width = *data++ + 1;
1468 else if (cmd == 0x47) 1745 else if (cmd == 0x47)
1469 { 1746 {
1470 if (*data == 4) 1747 if (*data == 1) cell->player = data [1];
1471 ; // decode player count 1748 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1749 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1750 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1472 1751
1473 data += *data + 1; 1752 data += *data + 1;
1474 } 1753 }
1475 else if (cmd == 8) // cell flags 1754 else if (cmd == 8) // cell flags
1476 cell->flags = *data++; 1755 cell->flags = *data++;
1483 } 1762 }
1484 else 1763 else
1485 cell->darkness = *data++ + 1; 1764 cell->darkness = *data++ + 1;
1486 } 1765 }
1487 1766
1767 for (z = 0; z <= 2; ++z)
1488 if (flags & 4) 1768 if (flags & (4 >> z))
1489 { 1769 {
1490 faceid face = (data [0] << 8) + data [1]; data += 2; 1770 faceid face = (data [0] << 8) + data [1]; data += 2;
1491 need_facenum (self, face); 1771 need_facenum (self, face);
1492 cell->tile [0] = self->face2tile [face]; 1772 cell->tile [z] = self->face2tile [face];
1773
1774 if (cell->tile [z])
1775 {
1776 maptex *tex = self->tex + cell->tile [z];
1777 if (!tex->name)
1778 av_push (missing, newSViv (cell->tile [z]));
1779
1780 if (tex->smoothtile)
1781 {
1782 maptex *smooth = self->tex + tex->smoothtile;
1783 if (!smooth->name)
1784 av_push (missing, newSViv (tex->smoothtile));
1785 }
1786 }
1493 } 1787 }
1494
1495 if (flags & 2)
1496 {
1497 faceid face = (data [0] << 8) + data [1]; data += 2;
1498 need_facenum (self, face);
1499 cell->tile [1] = self->face2tile [face];
1500 }
1501
1502 if (flags & 1)
1503 {
1504 faceid face = (data [0] << 8) + data [1]; data += 2;
1505 need_facenum (self, face);
1506 cell->tile [2] = self->face2tile [face];
1507 }
1508 } 1788 }
1509 else 1789 else
1510 cell->darkness = 0; 1790 CELL_CLEAR (cell);
1511 } 1791 }
1512} 1792}
1793 OUTPUT:
1794 RETVAL
1513 1795
1514SV * 1796SV *
1515mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1797mapmap (DC::Map self, int x0, int y0, int w, int h)
1516 CODE: 1798 CODE:
1517{ 1799{
1518 int x1, x; 1800 int x1, x;
1519 int y1, y; 1801 int y1, y;
1520 int z; 1802 int z;
1565} 1847}
1566 OUTPUT: 1848 OUTPUT:
1567 RETVAL 1849 RETVAL
1568 1850
1569void 1851void
1570draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1571 CODE: 1853 CODE:
1572{ 1854{
1855 int x, y, z;
1856
1573 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1574 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1858 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1575 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1576 smooth_key skey; 1860 smooth_key skey;
1577 int x, y, z; 1861 int pl_x, pl_y;
1578 int last_name; 1862 maptex pl_tex;
1863 rc_t *rc = rc_alloc ();
1864 rc_key_t key;
1865 rc_array_t *arr;
1866
1867 pl_tex.name = 0;
1579 1868
1580 // thats current max. sorry. 1869 // thats current max. sorry.
1581 if (sw > 255) sw = 255; 1870 if (sw > 255) sw = 255;
1582 if (sh > 255) sh = 255; 1871 if (sh > 255) sh = 255;
1583 1872
1584 // clear key, in case of extra padding 1873 // clear key, in case of extra padding
1585 memset (&skey, 0, sizeof (skey)); 1874 memset (&skey, 0, sizeof (skey));
1586 1875
1587 glColor4ub (255, 255, 255, 255); 1876 memset (&key, 0, sizeof (key));
1588 1877 key.r = 255;
1589 glEnable (GL_BLEND); 1878 key.g = 255;
1590 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1879 key.b = 255;
1591 glEnable (GL_TEXTURE_2D); 1880 key.a = 255;
1592 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1881 key.mode = GL_QUADS;
1593 1882 key.format = GL_T2F_V3F;
1594 glBegin (GL_QUADS); 1883 key.texname = -1;
1595
1596 last_name = 0;
1597 1884
1598 mx += self->x; 1885 mx += self->x;
1599 my += self->y; 1886 my += self->y;
1600 1887
1601 // first pass: determine smooth_max 1888 // first pass: determine smooth_max
1617 MAX (self->tex [cell->tile [0]].smoothlevel, 1904 MAX (self->tex [cell->tile [0]].smoothlevel,
1618 MAX (self->tex [cell->tile [1]].smoothlevel, 1905 MAX (self->tex [cell->tile [1]].smoothlevel,
1619 self->tex [cell->tile [2]].smoothlevel)); 1906 self->tex [cell->tile [2]].smoothlevel));
1620 } 1907 }
1621 } 1908 }
1909
1910 glEnable (GL_BLEND);
1911 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1622 1913
1623 for (z = 0; z <= 2; z++) 1914 for (z = 0; z <= 2; z++)
1624 { 1915 {
1625 memset (smooth_level, 0, sizeof (smooth_level)); 1916 memset (smooth_level, 0, sizeof (smooth_level));
1626 1917
1639 { 1930 {
1640 maptex tex = self->tex [tile]; 1931 maptex tex = self->tex [tile];
1641 int px = (x + 1) * T - tex.w; 1932 int px = (x + 1) * T - tex.w;
1642 int py = (y + 1) * T - tex.h; 1933 int py = (y + 1) * T - tex.h;
1643 1934
1644 // suppressing texture state switches here
1645 // is only moderately effective, but worth the extra effort
1646 if (last_name != tex.name) 1935 if (key.texname != tex.name)
1647 { 1936 {
1648 if (!tex.name) 1937 if (!tex.name)
1649 tex = self->tex [2]; /* missing, replace by noface */ 1938 tex = self->tex [2]; /* missing, replace by noface */
1650 1939
1651 glEnd (); 1940 key.texname = tex.name;
1652 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1941 arr = rc_array (rc, &key);
1653 glBegin (GL_QUADS);
1654 } 1942 }
1655 1943
1656 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1944 if (expect_false (cell->player == player) && expect_false (z == 2))
1657 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1658 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1659 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1660
1661 if (cell->flags && z == 2)
1662 { 1945 {
1946 pl_x = px;
1947 pl_y = py;
1948 pl_tex = tex;
1949 continue;
1950 }
1951
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1954 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1956
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1663 if (cell->flags & 1) 1960 if (cell->flags & 1)
1664 { 1961 {
1665 maptex tex = self->tex [1]; 1962 maptex tex = self->tex [1];
1666 int px = x * T + T * 2 / 32; 1963 int px = x * T + T * 2 / 32;
1667 int py = y * T - T * 6 / 32; 1964 int py = y * T - T * 6 / 32;
1668 1965
1966 if (tex.name)
1669 glEnd (); 1967 {
1670 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1671 glBegin (GL_QUADS); 1978 }
1672
1673 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1674 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1675 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1676 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1677 } 1979 }
1678 } 1980 }
1679 1981
1680 // update smooth hash 1982 // update smooth hash
1681 if (tex.smoothtile) 1983 if (tex.smoothtile)
1717 } 2019 }
1718 } 2020 }
1719 } 2021 }
1720 } 2022 }
1721 2023
2024 rc_draw (rc);
2025 rc_clear (rc);
2026
1722 // go through all smoothlevels, lowest to highest, then draw. 2027 // go through all smoothlevels, lowest to highest, then draw.
1723 // this is basically counting sort 2028 // this is basically counting sort
1724 { 2029 {
1725 int w, b; 2030 int w, b;
1726 2031
2032 glEnable (GL_TEXTURE_2D);
2033 glBegin (GL_QUADS);
1727 for (w = 0; w < 256 / 32; ++w) 2034 for (w = 0; w < 256 / 32; ++w)
1728 { 2035 {
1729 uint32_t smask = smooth_level [w]; 2036 uint32_t smask = smooth_level [w];
1730 if (smask) 2037 if (smask)
1731 for (b = 0; b < 32; ++b) 2038 for (b = 0; b < 32; ++b)
1740 smooth_key *skey = (smooth_key *)HeKEY (he); 2047 smooth_key *skey = (smooth_key *)HeKEY (he);
1741 IV bits = SvIVX (HeVAL (he)); 2048 IV bits = SvIVX (HeVAL (he));
1742 2049
1743 if (!(bits & 0x1000) 2050 if (!(bits & 0x1000)
1744 && skey->level == level 2051 && skey->level == level
1745 && level >= smooth_max [skey->x][skey->y]) 2052 && level > smooth_max [skey->x][skey->y])
1746 { 2053 {
1747 maptex tex = self->tex [skey->tile]; 2054 maptex tex = self->tex [skey->tile];
1748 int px = (((int)skey->x) - 1) * T; 2055 int px = (((int)skey->x) - 1) * T;
1749 int py = (((int)skey->y) - 1) * T; 2056 int py = (((int)skey->y) - 1) * T;
1750 int border = bits & 15; 2057 int border = bits & 15;
1751 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2058 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1752 float dx = tex.s * .0625f; // 16 images/row 2059 float dx = tex.s * .0625f; // 16 images/row
1753 float dy = tex.t * .5f ; // 2 images/column 2060 float dy = tex.t * .5f ; // 2 images/column
1754 2061
1755 // this time naively avoiding texture state changes
1756 // save gobs of state changes.
1757 if (last_name != tex.name) 2062 if (tex.name)
1758 { 2063 {
2064 // this time avoiding texture state changes
2065 // save gobs of state changes.
1759 if (!tex.name) 2066 if (key.texname != tex.name)
1760 continue; // smoothing not yet available 2067 {
1761
1762 glEnd (); 2068 glEnd ();
1763 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1764 glBegin (GL_QUADS); 2070 glBegin (GL_QUADS);
1765 } 2071 }
1766 2072
1767 if (border) 2073 if (border)
1768 { 2074 {
1769 float ox = border * dx; 2075 float ox = border * dx;
1770 2076
1771 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1772 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1774 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1775 } 2081 }
1776 2082
1777 if (corner) 2083 if (corner)
1778 { 2084 {
1779 float ox = corner * dx; 2085 float ox = corner * dx;
1780 2086
1781 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2087 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1782 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1783 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1784 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2091 }
1785 } 2092 }
1786 } 2093 }
1787 } 2094 }
1788 } 2095 }
1789 } 2096 }
2097
2098 glEnd ();
2099 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1;
1790 } 2101 }
1791 2102
1792 hv_clear (smooth); 2103 hv_clear (smooth);
1793 } 2104 }
1794 2105
1795 glEnd (); 2106 if (pl_tex.name)
2107 {
2108 maptex tex = pl_tex;
2109 int px = pl_x + sdx;
2110 int py = pl_y + sdy;
1796 2111
1797 glDisable (GL_TEXTURE_2D); 2112 key.texname = tex.name;
2113 arr = rc_array (rc, &key);
2114
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2119
2120 rc_draw (rc);
2121 }
2122
1798 glDisable (GL_BLEND); 2123 glDisable (GL_BLEND);
2124 rc_free (rc);
1799 2125
1800 // top layer: overlays such as the health bar 2126 // top layer: overlays such as the health bar
1801 for (y = 0; y < sh; y++) 2127 for (y = 0; y < sh; y++)
1802 if (0 <= y + my && y + my < self->rows) 2128 if (0 <= y + my && y + my < self->rows)
1803 { 2129 {
1828 } 2154 }
1829 } 2155 }
1830} 2156}
1831 2157
1832void 2158void
1833draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2159draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1834 CODE: 2160 CODE:
1835{ 2161{
1836 static float color[16][3] = { 2162 static float color[16][3] = {
1837 { 0.00F, 0.00F, 0.00F }, 2163 { 0.00F, 0.00F, 0.00F },
1838 { 1.00F, 1.00F, 1.00F }, 2164 { 1.00F, 1.00F, 1.00F },
1888 glDisable (GL_BLEND); 2214 glDisable (GL_BLEND);
1889 glDisable (GL_TEXTURE_2D); 2215 glDisable (GL_TEXTURE_2D);
1890} 2216}
1891 2217
1892void 2218void
1893fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2219fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1894 PPCODE: 2220 PPCODE:
1895{ 2221{
1896 int x, y; 2222 int x, y;
2223 int sw1 = sw + 2;
2224 int sh1 = sh + 2;
2225 int sh3 = sh * 3;
1897 int sw4 = (sw + 3) & ~3; 2226 int sw34 = (sw * 3 + 3) & ~3;
2227 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1898 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2228 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1899 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2229 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1900 2230
1901 memset (darkness, 255, sw4 * sh);
1902 SvPOK_only (darkness_sv); 2231 SvPOK_only (darkness3_sv);
1903 SvCUR_set (darkness_sv, sw4 * sh); 2232 SvCUR_set (darkness3_sv, sw34 * sh3);
1904 2233
1905 mx += self->x; 2234 mx += self->x - 1;
1906 my += self->y; 2235 my += self->y - 1;
1907 2236
2237 memset (darkness1, 255, sw1 * sh1);
2238
1908 for (y = 0; y < sh; y++) 2239 for (y = 0; y < sh1; y++)
1909 if (0 <= y + my && y + my < self->rows) 2240 if (0 <= y + my && y + my < self->rows)
1910 { 2241 {
1911 maprow *row = self->row + (y + my); 2242 maprow *row = self->row + (y + my);
1912 2243
1913 for (x = 0; x < sw; x++) 2244 for (x = 0; x < sw1; x++)
1914 if (row->c0 <= x + mx && x + mx < row->c1) 2245 if (row->c0 <= x + mx && x + mx < row->c1)
1915 { 2246 {
1916 mapcell *cell = row->col + (x + mx - row->c0); 2247 mapcell *cell = row->col + (x + mx - row->c0);
1917 2248
1918 darkness[y * sw4 + x] = cell->darkness 2249 darkness1 [y * sw1 + x] = cell->darkness
1919 ? 255 - (cell->darkness - 1) 2250 ? 255 - (cell->darkness - 1)
1920 : 255 - FOW_DARKNESS; 2251 : 255 - FOW_DARKNESS;
1921 } 2252 }
1922 } 2253 }
1923 2254
2255 for (y = 0; y < sh; ++y)
2256 for (x = 0; x < sw; ++x)
2257 {
2258 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2259 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2260 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2261 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2262 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2263 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2264 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2265 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2266 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2267
2268 uint8_t r11 = (d11 + d21 + d12) / 3;
2269 uint8_t r21 = d21;
2270 uint8_t r31 = (d21 + d31 + d32) / 3;
2271
2272 uint8_t r12 = d12;
2273 uint8_t r22 = d22;
2274 uint8_t r32 = d32;
2275
2276 uint8_t r13 = (d13 + d23 + d12) / 3;
2277 uint8_t r23 = d23;
2278 uint8_t r33 = (d23 + d33 + d32) / 3;
2279
2280 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2281 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2283 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2284 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2286 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2287 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2289 }
2290
2291 free (darkness1);
2292
1924 EXTEND (SP, 3); 2293 EXTEND (SP, 3);
1925 PUSHs (sv_2mortal (newSViv (sw4))); 2294 PUSHs (sv_2mortal (newSViv (sw34)));
1926 PUSHs (sv_2mortal (newSViv (sh))); 2295 PUSHs (sv_2mortal (newSViv (sh3)));
1927 PUSHs (darkness_sv); 2296 PUSHs (darkness3_sv);
1928} 2297}
1929 2298
1930SV * 2299SV *
1931get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2300get_rect (DC::Map self, int x0, int y0, int w, int h)
1932 CODE: 2301 CODE:
1933{ 2302{
1934 int x, y, x1, y1; 2303 int x, y, x1, y1;
1935 SV *data_sv = newSV (w * h * 7 + 5); 2304 SV *data_sv = newSV (w * h * 7 + 5);
1936 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2305 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1993 else 2362 else
1994 *data++ = 0; 2363 *data++ = 0;
1995 } 2364 }
1996 } 2365 }
1997 2366
2367 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 {
1998 SvPOK_only (data_sv); 2370 SvPOK_only (data_sv);
1999 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 }
2373
2000 RETVAL = data_sv; 2374 RETVAL = data_sv;
2001} 2375}
2002 OUTPUT: 2376 OUTPUT:
2003 RETVAL 2377 RETVAL
2004 2378
2005void 2379void
2006set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2380set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2007 PPCODE: 2381 PPCODE:
2008{ 2382{
2009 int x, y, z; 2383 int x, y, z;
2010 int w, h; 2384 int w, h;
2011 int x1, y1; 2385 int x1, y1;
2386 STRLEN len;
2387 uint8_t *data, *end;
2388
2389 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv);
2392 end = data + len + 8;
2393
2394 if (len < 5)
2395 XSRETURN_EMPTY;
2012 2396
2013 if (*data++ != 0) 2397 if (*data++ != 0)
2014 return; /* version mismatch */ 2398 XSRETURN_EMPTY; /* version mismatch */
2015 2399
2016 w = *data++ << 8; w |= *data++; 2400 w = *data++ << 8; w |= *data++;
2017 h = *data++ << 8; h |= *data++; 2401 h = *data++ << 8; h |= *data++;
2018 2402
2019 // we need to do this 'cause we don't keep an absolute coord system for rows 2403 // we need to do this 'cause we don't keep an absolute coord system for rows
2031 { 2415 {
2032 maprow *row = map_get_row (self, y); 2416 maprow *row = map_get_row (self, y);
2033 2417
2034 for (x = x0; x < x1; x++) 2418 for (x = x0; x < x1; x++)
2035 { 2419 {
2420 uint8_t flags;
2421
2422 if (data + 7 >= end)
2423 XSRETURN_EMPTY;
2424
2036 uint8_t flags = *data++; 2425 flags = *data++;
2037 2426
2038 if (flags) 2427 if (flags)
2039 { 2428 {
2040 mapcell *cell = row_get_cell (row, x); 2429 mapcell *cell = row_get_cell (row, x);
2041 tileid tile[3] = { 0, 0, 0 }; 2430 tileid tile[3] = { 0, 0, 0 };
2044 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2433 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2045 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2434 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2046 2435
2047 if (cell->darkness == 0) 2436 if (cell->darkness == 0)
2048 { 2437 {
2049 cell->darkness = 0; 2438 /*cell->darkness = 0;*/
2439 EXTEND (SP, 3);
2050 2440
2051 for (z = 0; z <= 2; z++) 2441 for (z = 0; z <= 2; z++)
2052 { 2442 {
2053 tileid t = tile [z]; 2443 tileid t = tile [z];
2054 2444
2055 if (t >= self->texs || (t && !self->tex [t].name)) 2445 if (t >= self->texs || (t && !self->tex [t].name))
2056 { 2446 {
2057 XPUSHs (sv_2mortal (newSViv (t))); 2447 PUSHs (sv_2mortal (newSViv (t)));
2058 need_texid (self, t); 2448 need_texid (self, t);
2059 } 2449 }
2060 2450
2061 cell->tile [z] = t; 2451 cell->tile [z] = t;
2062 } 2452 }
2064 } 2454 }
2065 } 2455 }
2066 } 2456 }
2067} 2457}
2068 2458
2069MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2459MODULE = Deliantra::Client PACKAGE = DC::RW
2070 2460
2071CFPlus::MixChunk 2461DC::RW
2072new_from_file (SV *class, char *path) 2462new (SV *class, SV *data_sv)
2073 CODE: 2463 CODE:
2074 RETVAL = Mix_LoadWAV (path); 2464{
2465 STRLEN datalen;
2466 char *data = SvPVbyte (data_sv, datalen);
2467
2468 RETVAL = SDL_RWFromConstMem (data, datalen);
2469}
2075 OUTPUT: 2470 OUTPUT:
2076 RETVAL 2471 RETVAL
2077 2472
2473DC::RW
2474new_from_file (SV *class, const char *path, const char *mode = "rb")
2475 CODE:
2476 RETVAL = SDL_RWFromFile (path, mode);
2477 OUTPUT:
2478 RETVAL
2479
2480# fails on win32:
2481# dc.xs(2268) : error C2059: syntax error : '('
2078void 2482#void
2483#close (DC::RW self)
2484# CODE:
2485# (self->(close)) (self);
2486
2487MODULE = Deliantra::Client PACKAGE = DC::Channel
2488
2489PROTOTYPES: DISABLE
2490
2491DC::Channel
2492find ()
2493 CODE:
2494{
2495 RETVAL = Mix_GroupAvailable (-1);
2496
2497 if (RETVAL < 0)
2498 {
2499 RETVAL = Mix_GroupOldest (-1);
2500
2501 if (RETVAL < 0)
2502 XSRETURN_UNDEF;
2503
2504 Mix_HaltChannel (RETVAL);
2505 }
2506
2507 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128);
2509}
2510 OUTPUT:
2511 RETVAL
2512
2513void
2514halt (DC::Channel self)
2515 CODE:
2516 Mix_HaltChannel (self);
2517
2518void
2519expire (DC::Channel self, int ticks = -1)
2520 CODE:
2521 Mix_ExpireChannel (self, ticks);
2522
2523void
2524fade_out (DC::Channel self, int ticks = -1)
2525 CODE:
2526 Mix_FadeOutChannel (self, ticks);
2527
2528int
2529volume (DC::Channel self, int volume)
2530 CODE:
2531 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2532 OUTPUT:
2533 RETVAL
2534
2535void
2536unregister_all_effects (DC::Channel self)
2537 CODE:
2538 Mix_UnregisterAllEffects (self);
2539
2540void
2541set_panning (DC::Channel self, int left, int right)
2542 CODE:
2543 left = CLAMP (left , 0, 255);
2544 right = CLAMP (right, 0, 255);
2545 Mix_SetPanning (self, left, right);
2546
2547void
2548set_distance (DC::Channel self, int distance)
2549 CODE:
2550 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2551
2552void
2553set_position (DC::Channel self, int angle, int distance)
2554 CODE:
2555
2556void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE:
2559{
2560 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2561 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563}
2564
2565void
2566set_reverse_stereo (DC::Channel self, int flip)
2567 CODE:
2568 Mix_SetReverseStereo (self, flip);
2569
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571
2572PROTOTYPES: DISABLE
2573
2574DC::MixChunk
2575new (SV *class, DC::RW rwops)
2576 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2578 OUTPUT:
2579 RETVAL
2580
2581void
2079DESTROY (CFPlus::MixChunk self) 2582DESTROY (DC::MixChunk self)
2080 CODE: 2583 CODE:
2081 Mix_FreeChunk (self); 2584 Mix_FreeChunk (self);
2082 2585
2083int 2586int
2084volume (CFPlus::MixChunk self, int volume = -1) 2587volume (DC::MixChunk self, int volume = -1)
2085 CODE: 2588 CODE:
2589 if (items > 1)
2590 volume = CLAMP (volume, 0, 128);
2086 RETVAL = Mix_VolumeChunk (self, volume); 2591 RETVAL = Mix_VolumeChunk (self, volume);
2087 OUTPUT: 2592 OUTPUT:
2088 RETVAL 2593 RETVAL
2089 2594
2090int 2595DC::Channel
2091play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2596play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2092 CODE: 2597 CODE:
2598{
2093 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2599 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2600
2601 if (RETVAL < 0)
2602 XSRETURN_UNDEF;
2603
2604 if (channel < 0)
2605 {
2606 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128);
2608 }
2609}
2094 OUTPUT: 2610 OUTPUT:
2095 RETVAL 2611 RETVAL
2096 2612
2097MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2098 2614
2099int 2615int
2100volume (int volume = -1) 2616volume (int volume = -1)
2617 PROTOTYPE: ;$
2101 CODE: 2618 CODE:
2619 if (items > 0)
2620 volume = CLAMP (volume, 0, 128);
2102 RETVAL = Mix_VolumeMusic (volume); 2621 RETVAL = Mix_VolumeMusic (volume);
2103 OUTPUT: 2622 OUTPUT:
2104 RETVAL 2623 RETVAL
2105 2624
2625void
2626fade_out (int ms)
2627 CODE:
2628 Mix_FadeOutMusic (ms);
2629
2630void
2631halt ()
2632 CODE:
2633 Mix_HaltMusic ();
2634
2106CFPlus::MixMusic 2635DC::MixMusic
2107new_from_file (SV *class, char *path) 2636new (SV *class, DC::RW rwops)
2108 CODE: 2637 CODE:
2109 RETVAL = Mix_LoadMUS (path); 2638 RETVAL = Mix_LoadMUS_RW (rwops);
2110 OUTPUT: 2639 OUTPUT:
2111 RETVAL 2640 RETVAL
2112 2641
2113void 2642void
2114DESTROY (CFPlus::MixMusic self) 2643DESTROY (DC::MixMusic self)
2115 CODE: 2644 CODE:
2116 Mix_FreeMusic (self); 2645 Mix_FreeMusic (self);
2117 2646
2118int 2647int
2119play (CFPlus::MixMusic self, int loops = -1) 2648play (DC::MixMusic self, int loops = -1)
2120 CODE: 2649 CODE:
2121 RETVAL = Mix_PlayMusic (self, loops); 2650 RETVAL = Mix_PlayMusic (self, loops);
2122 OUTPUT: 2651 OUTPUT:
2123 RETVAL 2652 RETVAL
2124 2653
2125MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2654void
2655fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2656 CODE:
2657 Mix_FadeInMusicPos (self, loops, ms, position);
2658
2659MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2660
2661PROTOTYPES: ENABLE
2126 2662
2127BOOT: 2663BOOT:
2128{ 2664{
2129 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2665 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2130 static const struct { 2666 static const struct {
2131 const char *name; 2667 const char *name;
2132 IV iv; 2668 IV iv;
2133 } *civ, const_iv[] = { 2669 } *civ, const_iv[] = {
2134# define const_iv(name) { # name, (IV)name } 2670# define const_iv(name) { # name, (IV)name }
2671 const_iv (GL_VENDOR),
2672 const_iv (GL_VERSION),
2673 const_iv (GL_EXTENSIONS),
2135 const_iv (GL_COLOR_MATERIAL), 2674 const_iv (GL_COLOR_MATERIAL),
2136 const_iv (GL_SMOOTH), 2675 const_iv (GL_SMOOTH),
2137 const_iv (GL_FLAT), 2676 const_iv (GL_FLAT),
2138 const_iv (GL_DITHER), 2677 const_iv (GL_DITHER),
2139 const_iv (GL_BLEND), 2678 const_iv (GL_BLEND),
2143 const_iv (GL_ALPHA_TEST), 2682 const_iv (GL_ALPHA_TEST),
2144 const_iv (GL_NORMALIZE), 2683 const_iv (GL_NORMALIZE),
2145 const_iv (GL_RESCALE_NORMAL), 2684 const_iv (GL_RESCALE_NORMAL),
2146 const_iv (GL_FRONT), 2685 const_iv (GL_FRONT),
2147 const_iv (GL_BACK), 2686 const_iv (GL_BACK),
2687 const_iv (GL_AUX0),
2148 const_iv (GL_AND), 2688 const_iv (GL_AND),
2149 const_iv (GL_ONE), 2689 const_iv (GL_ONE),
2150 const_iv (GL_ZERO), 2690 const_iv (GL_ZERO),
2151 const_iv (GL_SRC_ALPHA), 2691 const_iv (GL_SRC_ALPHA),
2152 const_iv (GL_DST_ALPHA), 2692 const_iv (GL_DST_ALPHA),
2165 const_iv (GL_INTENSITY), 2705 const_iv (GL_INTENSITY),
2166 const_iv (GL_LUMINANCE), 2706 const_iv (GL_LUMINANCE),
2167 const_iv (GL_LUMINANCE_ALPHA), 2707 const_iv (GL_LUMINANCE_ALPHA),
2168 const_iv (GL_FLOAT), 2708 const_iv (GL_FLOAT),
2169 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2709 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2710 const_iv (GL_COMPRESSED_ALPHA_ARB),
2711 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2712 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2713 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2714 const_iv (GL_COMPRESSED_RGB_ARB),
2715 const_iv (GL_COMPRESSED_RGBA_ARB),
2170 const_iv (GL_COMPILE), 2716 const_iv (GL_COMPILE),
2717 const_iv (GL_PROXY_TEXTURE_1D),
2718 const_iv (GL_PROXY_TEXTURE_2D),
2171 const_iv (GL_TEXTURE_1D), 2719 const_iv (GL_TEXTURE_1D),
2172 const_iv (GL_TEXTURE_2D), 2720 const_iv (GL_TEXTURE_2D),
2173 const_iv (GL_TEXTURE_ENV), 2721 const_iv (GL_TEXTURE_ENV),
2174 const_iv (GL_TEXTURE_MAG_FILTER), 2722 const_iv (GL_TEXTURE_MAG_FILTER),
2175 const_iv (GL_TEXTURE_MIN_FILTER), 2723 const_iv (GL_TEXTURE_MIN_FILTER),
2196 const_iv (GL_COLOR_LOGIC_OP), 2744 const_iv (GL_COLOR_LOGIC_OP),
2197 const_iv (GL_SEPARABLE_2D), 2745 const_iv (GL_SEPARABLE_2D),
2198 const_iv (GL_CONVOLUTION_2D), 2746 const_iv (GL_CONVOLUTION_2D),
2199 const_iv (GL_CONVOLUTION_BORDER_MODE), 2747 const_iv (GL_CONVOLUTION_BORDER_MODE),
2200 const_iv (GL_CONSTANT_BORDER), 2748 const_iv (GL_CONSTANT_BORDER),
2749 const_iv (GL_POINTS),
2201 const_iv (GL_LINES), 2750 const_iv (GL_LINES),
2202 const_iv (GL_LINE_STRIP), 2751 const_iv (GL_LINE_STRIP),
2203 const_iv (GL_LINE_LOOP), 2752 const_iv (GL_LINE_LOOP),
2204 const_iv (GL_QUADS), 2753 const_iv (GL_QUADS),
2205 const_iv (GL_QUAD_STRIP), 2754 const_iv (GL_QUAD_STRIP),
2206 const_iv (GL_TRIANGLES), 2755 const_iv (GL_TRIANGLES),
2207 const_iv (GL_TRIANGLE_STRIP), 2756 const_iv (GL_TRIANGLE_STRIP),
2208 const_iv (GL_TRIANGLE_FAN), 2757 const_iv (GL_TRIANGLE_FAN),
2758 const_iv (GL_POLYGON),
2209 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2759 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2760 const_iv (GL_POINT_SMOOTH_HINT),
2761 const_iv (GL_LINE_SMOOTH_HINT),
2762 const_iv (GL_POLYGON_SMOOTH_HINT),
2763 const_iv (GL_GENERATE_MIPMAP_HINT),
2764 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2210 const_iv (GL_FASTEST), 2765 const_iv (GL_FASTEST),
2766 const_iv (GL_DONT_CARE),
2767 const_iv (GL_NICEST),
2211 const_iv (GL_V2F), 2768 const_iv (GL_V2F),
2212 const_iv (GL_V3F), 2769 const_iv (GL_V3F),
2213 const_iv (GL_T2F_V3F), 2770 const_iv (GL_T2F_V3F),
2214 const_iv (GL_T2F_N3F_V3F), 2771 const_iv (GL_T2F_N3F_V3F),
2215# undef const_iv 2772# undef const_iv
2216 }; 2773 };
2217 2774
2218 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2219 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2777
2778 texture_av = newAV ();
2779 AvREAL_off (texture_av);
2220} 2780}
2781
2782void
2783disable_GL_EXT_blend_func_separate ()
2784 CODE:
2785 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0;
2221 2787
2222char * 2788char *
2223gl_vendor () 2789gl_vendor ()
2224 CODE: 2790 CODE:
2225 RETVAL = (char *)glGetString (GL_VENDOR); 2791 RETVAL = (char *)glGetString (GL_VENDOR);
2238 CODE: 2804 CODE:
2239 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2805 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2240 OUTPUT: 2806 OUTPUT:
2241 RETVAL 2807 RETVAL
2242 2808
2809const char *glGetString (GLenum pname)
2810
2811GLint glGetInteger (GLenum pname)
2812 CODE:
2813 glGetIntegerv (pname, &RETVAL);
2814 OUTPUT:
2815 RETVAL
2816
2817GLdouble glGetDouble (GLenum pname)
2818 CODE:
2819 glGetDoublev (pname, &RETVAL);
2820 OUTPUT:
2821 RETVAL
2822
2243int glGetError () 2823int glGetError ()
2244 2824
2245void glFinish () 2825void glFinish ()
2246 2826
2247void glClear (int mask) 2827void glClear (int mask)
2284# near_ and far_ are due to microsofts buggy "c" compiler 2864# near_ and far_ are due to microsofts buggy "c" compiler
2285void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2865void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2286 2866
2287# near_ and far_ are due to microsofts buggy "c" compiler 2867# near_ and far_ are due to microsofts buggy "c" compiler
2288void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2868void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2869
2870PROTOTYPES: DISABLE
2289 2871
2290void glViewport (int x, int y, int width, int height) 2872void glViewport (int x, int y, int width, int height)
2291 2873
2292void glScissor (int x, int y, int width, int height) 2874void glScissor (int x, int y, int width, int height)
2293 2875
2301 2883
2302void glRotate (float angle, float x, float y, float z) 2884void glRotate (float angle, float x, float y, float z)
2303 CODE: 2885 CODE:
2304 glRotatef (angle, x, y, z); 2886 glRotatef (angle, x, y, z);
2305 2887
2306void glBegin (int mode)
2307
2308void glEnd ()
2309
2310void glColor (float r, float g, float b, float a = 1.0) 2888void glColor (float r, float g, float b, float a = 1.0)
2311 PROTOTYPE: @
2312 ALIAS: 2889 ALIAS:
2313 glColor_premultiply = 1 2890 glColor_premultiply = 1
2314 CODE: 2891 CODE:
2315 if (ix) 2892 if (ix)
2316 { 2893 {
2319 b *= a; 2896 b *= a;
2320 } 2897 }
2321 // microsoft visual "c" rounds instead of truncating... 2898 // microsoft visual "c" rounds instead of truncating...
2322 glColor4f (r, g, b, a); 2899 glColor4f (r, g, b, a);
2323 2900
2324void glInterleavedArrays (int format, int stride, char *data)
2325
2326void glDrawElements (int mode, int count, int type, char *indices)
2327
2328# 1.2 void glDrawRangeElements (int mode, int start, int end
2329
2330void glRasterPos (float x, float y, float z = 0.) 2901void glRasterPos (float x, float y, float z = 0.)
2331 CODE: 2902 CODE:
2332 glRasterPos3f (0, 0, z); 2903 glRasterPos3f (0, 0, z);
2333 glBitmap (0, 0, 0, 0, x, y, 0); 2904 glBitmap (0, 0, 0, 0, x, y, 0);
2334 2905
2338 2909
2339void glTexCoord (float s, float t) 2910void glTexCoord (float s, float t)
2340 CODE: 2911 CODE:
2341 glTexCoord2f (s, t); 2912 glTexCoord2f (s, t);
2342 2913
2914void glRect (float x1, float y1, float x2, float y2)
2915 CODE:
2916 glRectf (x1, y1, x2, y2);
2917
2918void glRect_lineloop (float x1, float y1, float x2, float y2)
2919 CODE:
2920 glBegin (GL_LINE_LOOP);
2921 glVertex2f (x1, y1);
2922 glVertex2f (x2, y1);
2923 glVertex2f (x2, y2);
2924 glVertex2f (x1, y2);
2925 glEnd ();
2926
2927PROTOTYPES: ENABLE
2928
2929void glBegin (int mode)
2930
2931void glEnd ()
2932
2933void glPointSize (GLfloat size)
2934
2935void glLineWidth (GLfloat width)
2936
2937void glInterleavedArrays (int format, int stride, char *data)
2938
2939void glDrawElements (int mode, int count, int type, char *indices)
2940
2941# 1.2 void glDrawRangeElements (int mode, int start, int end
2942
2343void glTexEnv (int target, int pname, float param) 2943void glTexEnv (int target, int pname, float param)
2344 CODE: 2944 CODE:
2345 glTexEnvf (target, pname, param); 2945 glTexEnvf (target, pname, param);
2346 2946
2347void glTexParameter (int target, int pname, float param) 2947void glTexParameter (int target, int pname, float param)
2363void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2963void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2364 CODE: 2964 CODE:
2365 if (gl.SeparableFilter2D) 2965 if (gl.SeparableFilter2D)
2366 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2966 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2367 2967
2368void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2968void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2369 2969
2370void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2970void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2371 2971
2372void glDrawPixels (int width, int height, int format, int type, char *pixels) 2972void glDrawPixels (int width, int height, int format, int type, char *pixels)
2973
2974void glPixelZoom (float x, float y)
2373 2975
2374void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2976void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2375 2977
2376int glGenTexture () 2978int glGenTexture ()
2377 CODE: 2979 CODE:
2378{ 2980 RETVAL = gen_texture ();
2379 GLuint name;
2380 if (AvFILL (texture_av) >= 0)
2381 name = (GLuint)av_pop (texture_av);
2382 else
2383 glGenTextures (1, &name);
2384 RETVAL = name;
2385}
2386 OUTPUT: 2981 OUTPUT:
2387 RETVAL 2982 RETVAL
2388 2983
2389void glDeleteTexture (int name) 2984void glDeleteTexture (int name)
2390 CODE: 2985 CODE:
2391{ 2986 del_texture (name);
2392 /* make a half-assed attempt at returning the memory used by the texture */ 2987
2393 /* textures are frequently being reused by cfplus anyway */
2394 glBindTexture (GL_TEXTURE_2D, name);
2395 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
2396 av_push (texture_av, (SV *)name);
2397 /*glDeleteTextures (1, &name_);*/
2398}
2399
2400int glGenList () 2988int glGenList ()
2401 CODE: 2989 CODE:
2402 RETVAL = glGenLists (1); 2990 RETVAL = glGenLists (1);
2403 OUTPUT: 2991 OUTPUT:
2404 RETVAL 2992 RETVAL
2411 2999
2412void glEndList () 3000void glEndList ()
2413 3001
2414void glCallList (int list) 3002void glCallList (int list)
2415 3003
3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3005
3006PROTOTYPES: DISABLE
3007
3008void
3009find_widget (SV *self, NV x, NV y)
3010 PPCODE:
3011{
3012 if (within_widget (self, x, y))
3013 XPUSHs (self);
3014}
3015
3016BOOT:
3017{
3018 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3019
3020 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3021 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3022 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3023 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3024}
3025
3026void
3027draw (SV *self)
3028 CODE:
3029{
3030 HV *hv;
3031 SV **svp;
3032 NV x, y, w, h;
3033 SV *draw_x_sv = GvSV (draw_x_gv);
3034 SV *draw_y_sv = GvSV (draw_y_gv);
3035 SV *draw_w_sv = GvSV (draw_w_gv);
3036 SV *draw_h_sv = GvSV (draw_h_gv);
3037 double draw_x, draw_y;
3038
3039 if (!SvROK (self))
3040 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3041
3042 hv = (HV *)SvRV (self);
3043
3044 if (SvTYPE (hv) != SVt_PVHV)
3045 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3046
3047 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3048 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3049
3050 if (!h || !w)
3051 XSRETURN_EMPTY;
3052
3053 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3054 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3055
3056 draw_x = SvNV (draw_x_sv) + x;
3057 draw_y = SvNV (draw_y_sv) + y;
3058
3059 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3060 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3061 XSRETURN_EMPTY;
3062
3063 sv_setnv (draw_x_sv, draw_x);
3064 sv_setnv (draw_y_sv, draw_y);
3065
3066 glPushMatrix ();
3067 glTranslated (x, y, 0);
3068
3069 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3070 {
3071 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3072
3073 if (svp && SvTRUE (*svp))
3074 {
3075 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3076 glEnable (GL_BLEND);
3077 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3078 glBegin (GL_QUADS);
3079 glVertex2f (0, 0);
3080 glVertex2f (w, 0);
3081 glVertex2f (w, h);
3082 glVertex2f (0, h);
3083 glEnd ();
3084 glDisable (GL_BLEND);
3085 }
3086 }
3087#if 0
3088 // draw borders, for debugging
3089 glPushMatrix ();
3090 glColor4f (1., 1., 0., 1.);
3091 glTranslatef (.5, .5, 0.);
3092 glBegin (GL_LINE_LOOP);
3093 glVertex2f (0 , 0);
3094 glVertex2f (w - 1, 0);
3095 glVertex2f (w - 1, h - 1);
3096 glVertex2f (0 , h - 1);
3097 glEnd ();
3098 glPopMatrix ();
3099#endif
3100 PUSHMARK (SP);
3101 XPUSHs (self);
3102 PUTBACK;
3103 call_method ("_draw", G_VOID | G_DISCARD);
3104 SPAGAIN;
3105
3106 glPopMatrix ();
3107
3108 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3109 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3110}
3111

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines