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.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
6#endif 14#endif
7 15
8#include "EXTERN.h" 16#include "EXTERN.h"
9#include "perl.h" 17#include "perl.h"
10#include "XSUB.h" 18#include "XSUB.h"
11 19
20#ifdef _WIN32
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
27#endif
28
29#include <assert.h>
12#include <math.h> 30#include <math.h>
13#include <string.h> 31#include <string.h>
14#include <stdio.h> 32#include <stdio.h>
33#include <stdlib.h>
34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
15 36
16#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
17#include <SDL_endian.h> 39#include <SDL_endian.h>
18#include <SDL_image.h> 40#include <SDL_image.h>
19#include <SDL_mixer.h> 41#include <SDL_mixer.h>
20#include <SDL_opengl.h> 42#include <SDL_opengl.h>
21 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
49#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS
51
22#include <glib/gmacros.h> 52#include <glib/gmacros.h>
23 53
24#include <pango/pango.h> 54#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h> 55
26#include <pango/pangoft2.h> 56#ifndef PANGO_VERSION_CHECK
27#include <pango/pangocairo.h> 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
28 66
29#ifndef _WIN32 67#ifndef _WIN32
30# include <sys/types.h> 68# include <sys/types.h>
31# include <sys/socket.h> 69# include <sys/socket.h>
32# include <netinet/in.h> 70# include <netinet/in.h>
33# include <netinet/tcp.h> 71# include <netinet/tcp.h>
34# include <inttypes.h> 72# include <inttypes.h>
73#endif
74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
35#else 77#else
36 typedef unsigned char uint8_t; 78# define expect(expr,value) (expr)
37 typedef unsigned short uint16_t;
38 typedef unsigned int uint32_t;
39 typedef signed char int8_t;
40 typedef signed short int16_t;
41 typedef signed int int32_t;
42#endif 79#endif
43 80
44#include "glext.h" 81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 85
46#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
47 87
48#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
50 90
51#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
52 92
53#define GL_CALL(type,func,args) \ 93/* mask out modifiers we are not interested in */
54 { \ 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
55 static int init_; \
56 static type fptr_; \
57 \
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
67 95
96static AV *texture_av;
97
98static struct
99{
100#define GL_FUNC(ptr,name) ptr name;
101#include "glfunc.h"
102#undef GL_FUNC
103} gl;
104
105static void
106gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
107{
108 if (gl.BlendFuncSeparate)
109 gl.BlendFuncSeparate (sa, da, saa, daa);
110 else if (gl.BlendFuncSeparateEXT)
111 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
112 else
113 glBlendFunc (sa, da);
114}
115
116static GLuint
117gen_texture ()
118{
119 GLuint name;
120
121 if (AvFILL (texture_av) >= 0)
122 name = (GLuint)(size_t)av_pop (texture_av);
123 else
124 glGenTextures (1, &name);
125
126 return name;
127}
128
129static void
130del_texture (GLuint name)
131{
132 /* make a half-assed attempt at returning the memory used by the texture */
133 /* textures are frequently being reused by cfplus anyway */
134 /*glBindTexture (GL_TEXTURE_2D, name);*/
135 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
136 av_push (texture_av, (SV *)(size_t)name);
137 glDeleteTextures (1, &name);
138}
139
140#include "texcache.c"
141#include "rendercache.c"
142
143#include "pango-font.c"
144#include "pango-fontmap.c"
145#include "pango-render.c"
146
147typedef IV DC__Channel;
148typedef SDL_RWops *DC__RW;
68typedef Mix_Chunk *CFClient__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 150typedef Mix_Music *DC__MixMusic;
70 151
71typedef PangoFontDescription *CFClient__Font; 152typedef PangoFontDescription *DC__Font;
153
154static int
155shape_attr_p (PangoLayoutRun *run)
156{
157 GSList *attrs = run->item->analysis.extra_attrs;
158
159 while (attrs)
160 {
161 PangoAttribute *attr = attrs->data;
162
163 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1;
165
166 attrs = attrs->next;
167 }
168
169 return 0;
170}
72 171
73typedef struct cf_layout { 172typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 173 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
77 int base_height; 175 int base_height;
78 CFClient__Font font; 176 DC__Font font;
177 rc_t *rc;
79} *CFClient__Layout; 178} *DC__Layout;
80 179
81static CFClient__Font default_font; 180static DC__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 181static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 182static PangoFontMap *opengl_fontmap;
84 183
85static void 184static void
86substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
87{ 186{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 187 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 188#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 190#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 192}
95 193
96static void 194static void
97layout_update_font (CFClient__Layout self) 195layout_update_font (DC__Layout self)
98{ 196{
99 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
100 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
101 */ 199 */
102 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
103 201
104 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
105 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
106 204
107 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
108} 206}
109 207
110static void 208static void
111layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
112{ 210{
211 PangoRectangle rect;
212
213 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 214 pango_layout_get_extents (self->pl, 0, &rect);
114 215
115 if (!*w) *w = 1; 216 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 217 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 218
118 *w = (*w + 3) & ~3; 219 if (!rect.width) rect.width = 1;
119} 220 if (!rect.height) rect.height = 1;
120 221
222 *w = rect.width;
223 *h = rect.height;
224}
225
226typedef uint16_t tileid;
121typedef uint16_t mapface; 227typedef uint16_t faceid;
122 228
123typedef struct { 229typedef struct {
124 GLint name; 230 GLuint name;
125 int w, h; 231 int w, h;
126 float s, t; 232 float s, t;
127 uint8_t r, g, b, a; 233 uint8_t r, g, b, a;
234 tileid smoothtile;
235 uint8_t smoothlevel;
128} maptex; 236} maptex;
129 237
130typedef struct { 238typedef struct {
239 uint32_t player;
240 tileid tile[3];
131 int16_t darkness; 241 uint16_t darkness;
132 mapface face[3]; 242 uint8_t stat_width, stat_hp, flags, smoothmax;
133} mapcell; 243} mapcell;
134 244
135typedef struct { 245typedef struct {
136 int32_t c0, c1; 246 int32_t c0, c1;
137 mapcell *col; 247 mapcell *col;
138} maprow; 248} maprow;
139 249
140typedef struct map { 250typedef struct map {
141 int x, y, w, h; 251 int x, y, w, h;
142 int ox, oy; /* offset to virtual global coordinate system */ 252 int ox, oy; /* offset to virtual global coordinate system */
143 int faces; 253 int faces; tileid *face2tile; // [faceid]
144 mapface *face; 254 int texs; maptex *tex; // [tileid]
145
146 int texs;
147 maptex *tex;
148 255
149 int32_t rows; 256 int32_t rows;
150 maprow *row; 257 maprow *row;
151} *CFClient__Map; 258} *DC__Map;
152 259
153static char * 260static char *
154prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
155{ 262{
156 char *p; 263 char *p;
173} 280}
174 281
175#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 282#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 283#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177 284
285static void
286need_facenum (struct map *self, faceid face)
287{
288 while (self->faces <= face)
289 {
290 Append (tileid, self->face2tile, self->faces, self->faces);
291 self->faces *= 2;
292 }
293}
294
295static void
296need_texid (struct map *self, int texid)
297{
298 while (self->texs <= texid)
299 {
300 Append (maptex, self->tex, self->texs, self->texs);
301 self->texs *= 2;
302 }
303}
304
178static maprow * 305static maprow *
179map_get_row (CFClient__Map self, int y) 306map_get_row (DC__Map self, int y)
180{ 307{
181 if (0 > y) 308 if (0 > y)
182 { 309 {
183 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
222 349
223 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
224} 351}
225 352
226static mapcell * 353static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
228{ 355{
229 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
230} 357}
231 358
232static void 359static void
233map_clear (CFClient__Map self) 360map_clear (DC__Map self)
234{ 361{
235 int r; 362 int r;
236 363
237 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
245 self->oy = 0; 372 self->oy = 0;
246 self->row = 0; 373 self->row = 0;
247 self->rows = 0; 374 self->rows = 0;
248} 375}
249 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
250static void 387static void
251map_blank (CFClient__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
252{ 389{
253 int x, y; 390 int x, y;
254 maprow *row; 391 maprow *row;
392 mapcell *cell;
255 393
256 for (y = y0; y < y0 + h; y++) 394 for (y = y0; y < y0 + h; y++)
257 if (y >= 0) 395 if (y >= 0)
258 { 396 {
259 if (y >= self->rows) 397 if (y >= self->rows)
265 if (x >= row->c0) 403 if (x >= row->c0)
266 { 404 {
267 if (x >= row->c1) 405 if (x >= row->c1)
268 break; 406 break;
269 407
270 row->col[x - row->c0].darkness = -1; 408 cell = row->col + x - row->c0;
409
410 CELL_CLEAR (cell);
271 } 411 }
272 } 412 }
413}
414
415typedef struct {
416 tileid tile;
417 uint8_t x, y, level;
418} smooth_key;
419
420static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits)
422{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
424
425 if (SvIOK (*sv))
426 SvIV_set (*sv, SvIVX (*sv) | bits);
427 else
428 sv_setiv (*sv, bits);
273} 429}
274 430
275static void 431static void
276music_finished (void) 432music_finished (void)
277{ 433{
296 ev.data2 = 0; 452 ev.data2 = 0;
297 453
298 SDL_PushEvent ((SDL_Event *)&ev); 454 SDL_PushEvent ((SDL_Event *)&ev);
299} 455}
300 456
301MODULE = CFClient PACKAGE = CFClient 457static unsigned int
458minpot (unsigned int n)
459{
460 if (!n)
461 return 0;
462
463 --n;
464
465 n |= n >> 1;
466 n |= n >> 2;
467 n |= n >> 4;
468 n |= n >> 8;
469 n |= n >> 16;
470
471 return n + 1;
472}
473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
485/* SDL should provide this, really. */
486#define SDLK_MODIFIER_MIN 300
487#define SDLK_MODIFIER_MAX 314
488
489/******************************************************************************/
490
491static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
492static GV *hover_gv;
493
494static int
495within_widget (SV *widget, NV x, NV y)
496{
497 HV *self;
498 SV **svp;
499 NV wx, ww, wy, wh;
500
501 if (!SvROK (widget))
502 return 0;
503
504 self = (HV *)SvRV (widget);
505
506 if (SvTYPE (self) != SVt_PVHV)
507 return 0;
508
509 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
510 if (y < wy)
511 return 0;
512
513 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
514 if (y >= wy + wh)
515 return 0;
516
517 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
518 if (x < wx)
519 return 0;
520
521 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
522 if (x >= wx + ww)
523 return 0;
524
525 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
526 if (!svp || !SvTRUE (*svp))
527 return 0;
528
529 return 1;
530}
531
532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
569
570MODULE = Deliantra::Client PACKAGE = DC
302 571
303PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
304 573
305BOOT: 574BOOT:
306{ 575{
307 HV *stash = gv_stashpv ("CFClient", 1); 576 HV *stash = gv_stashpv ("DC", 1);
308 static const struct { 577 static const struct {
309 const char *name; 578 const char *name;
310 IV iv; 579 IV iv;
311 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
582 const_iv (SDLK_MODIFIER_MIN),
583 const_iv (SDLK_MODIFIER_MAX),
584
313 const_iv (SDL_ACTIVEEVENT), 585 const_iv (SDL_ACTIVEEVENT),
314 const_iv (SDL_KEYDOWN), 586 const_iv (SDL_KEYDOWN),
315 const_iv (SDL_KEYUP), 587 const_iv (SDL_KEYUP),
316 const_iv (SDL_MOUSEMOTION), 588 const_iv (SDL_MOUSEMOTION),
317 const_iv (SDL_MOUSEBUTTONDOWN), 589 const_iv (SDL_MOUSEBUTTONDOWN),
326 const_iv (SDL_EVENT_RESERVEDA), 598 const_iv (SDL_EVENT_RESERVEDA),
327 const_iv (SDL_EVENT_RESERVEDB), 599 const_iv (SDL_EVENT_RESERVEDB),
328 const_iv (SDL_VIDEORESIZE), 600 const_iv (SDL_VIDEORESIZE),
329 const_iv (SDL_VIDEOEXPOSE), 601 const_iv (SDL_VIDEOEXPOSE),
330 const_iv (SDL_USEREVENT), 602 const_iv (SDL_USEREVENT),
603
604 const_iv (SDL_APPINPUTFOCUS),
605 const_iv (SDL_APPMOUSEFOCUS),
606 const_iv (SDL_APPACTIVE),
607
608 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST),
331 const_iv (SDLK_KP0), 610 const_iv (SDLK_KP0),
332 const_iv (SDLK_KP1), 611 const_iv (SDLK_KP1),
333 const_iv (SDLK_KP2), 612 const_iv (SDLK_KP2),
334 const_iv (SDLK_KP3), 613 const_iv (SDLK_KP3),
335 const_iv (SDLK_KP4), 614 const_iv (SDLK_KP4),
390 const_iv (SDLK_BREAK), 669 const_iv (SDLK_BREAK),
391 const_iv (SDLK_MENU), 670 const_iv (SDLK_MENU),
392 const_iv (SDLK_POWER), 671 const_iv (SDLK_POWER),
393 const_iv (SDLK_EURO), 672 const_iv (SDLK_EURO),
394 const_iv (SDLK_UNDO), 673 const_iv (SDLK_UNDO),
674
395 const_iv (KMOD_NONE), 675 const_iv (KMOD_NONE),
676 const_iv (KMOD_SHIFT),
396 const_iv (KMOD_LSHIFT), 677 const_iv (KMOD_LSHIFT),
397 const_iv (KMOD_RSHIFT), 678 const_iv (KMOD_RSHIFT),
679 const_iv (KMOD_CTRL),
398 const_iv (KMOD_LCTRL), 680 const_iv (KMOD_LCTRL),
399 const_iv (KMOD_RCTRL), 681 const_iv (KMOD_RCTRL),
682 const_iv (KMOD_ALT),
400 const_iv (KMOD_LALT), 683 const_iv (KMOD_LALT),
401 const_iv (KMOD_RALT), 684 const_iv (KMOD_RALT),
685 const_iv (KMOD_META),
402 const_iv (KMOD_LMETA), 686 const_iv (KMOD_LMETA),
403 const_iv (KMOD_RMETA), 687 const_iv (KMOD_RMETA),
404 const_iv (KMOD_NUM), 688 const_iv (KMOD_NUM),
405 const_iv (KMOD_CAPS), 689 const_iv (KMOD_CAPS),
406 const_iv (KMOD_MODE), 690 const_iv (KMOD_MODE),
407 const_iv (KMOD_CTRL), 691
408 const_iv (KMOD_SHIFT), 692 const_iv (MIX_DEFAULT_FORMAT),
409 const_iv (KMOD_ALT), 693
410 const_iv (KMOD_META) 694 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO),
697 const_iv (SDL_INIT_CDROM),
698 const_iv (SDL_INIT_JOYSTICK),
699 const_iv (SDL_INIT_EVERYTHING),
700 const_iv (SDL_INIT_NOPARACHUTE),
701 const_iv (SDL_INIT_EVENTTHREAD),
702
703 const_iv (SDL_GL_RED_SIZE),
704 const_iv (SDL_GL_GREEN_SIZE),
705 const_iv (SDL_GL_BLUE_SIZE),
706 const_iv (SDL_GL_ALPHA_SIZE),
707 const_iv (SDL_GL_DOUBLEBUFFER),
708 const_iv (SDL_GL_BUFFER_SIZE),
709 const_iv (SDL_GL_DEPTH_SIZE),
710 const_iv (SDL_GL_STENCIL_SIZE),
711 const_iv (SDL_GL_ACCUM_RED_SIZE),
712 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
713 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
714 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
715 const_iv (SDL_GL_STEREO),
716 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
717 const_iv (SDL_GL_MULTISAMPLESAMPLES),
718 const_iv (SDL_GL_ACCELERATED_VISUAL),
719 const_iv (SDL_GL_SWAP_CONTROL),
720
721 const_iv (FOW_DARKNESS)
411# undef const_iv 722# undef const_iv
412 }; 723 };
413 724
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 725 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
727
728 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
729 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
416} 730}
731
732void
733weaken (SV *rv)
734 PROTOTYPE: $
735 CODE:
736 sv_rvweaken (rv);
737
738int
739in_destruct ()
740 CODE:
741 RETVAL = PL_main_cv == Nullcv;
742 OUTPUT:
743 RETVAL
744
745NV floor (NV x)
746
747NV ceil (NV x)
748
749IV minpot (UV n)
750
751IV popcount (UV n)
417 752
418void 753void
419pango_init () 754pango_init ()
420 CODE: 755 CODE:
421{ 756{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 757 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 758 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 759 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426 760 /*pango_context_set_font_description (opengl_context, default_font);*/
427 cairo_fontmap = pango_cairo_font_map_get_default (); 761#if PANGO_VERSION_CHECK (1, 15, 2)
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 762 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
763 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
764#endif
429} 765}
430 766
431int 767char *SDL_GetError ()
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
433 768
434void 769void SDL_braino ()
770
771int SDL_Init (U32 flags)
772
773int SDL_InitSubSystem (U32 flags)
774
775void SDL_QuitSubSystem (U32 flags)
776
435SDL_Quit () 777void SDL_Quit ()
436 778
779int SDL_GL_SetAttribute (int attr, int value)
780
781int SDL_GL_GetAttribute (int attr)
782 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL))
784 XSRETURN_UNDEF;
785 OUTPUT:
786 RETVAL
787
437void 788void
438SDL_ListModes () 789SDL_ListModes (int rgb, int alpha)
439 PPCODE: 790 PPCODE:
440{ 791{
441 SDL_Rect **m; 792 SDL_Rect **m;
442 793
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 794 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 795 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 796 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 797 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
447 798
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 799 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 800 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
450 801
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 802 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 803 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 806
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 807 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
457 808 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
458 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 809
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 810 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
462 811
463 if (m && m != (SDL_Rect **)-1) 812 if (m && m != (SDL_Rect **)-1)
464 while (*m) 813 while (*m)
465 { 814 {
815 if ((*m)->w >= 400 && (*m)->h >= 300)
816 {
466 AV *av = newAV (); 817 AV *av = newAV ();
467 av_push (av, newSViv ((*m)->w)); 818 av_push (av, newSViv ((*m)->w));
468 av_push (av, newSViv ((*m)->h)); 819 av_push (av, newSViv ((*m)->h));
820 av_push (av, newSViv (rgb));
821 av_push (av, newSViv (alpha));
469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 822 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
823 }
470 824
471 ++m; 825 ++m;
472 } 826 }
473} 827}
474 828
475int 829int
476SDL_SetVideoMode (int w, int h, int fullscreen) 830SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
477 CODE: 831 CODE:
832{
833 SDL_EnableUNICODE (1);
834 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
835
836 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
837 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
838 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
839 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
840
478 RETVAL = !!SDL_SetVideoMode ( 841 RETVAL = !!SDL_SetVideoMode (
479 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 842 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
480 ); 843 );
481 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 844
845 if (RETVAL)
846 {
847 av_clear (texture_av);
848
849 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
850#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
851#include "glfunc.h"
852#undef GL_FUNC
853 }
854}
482 OUTPUT: 855 OUTPUT:
483 RETVAL 856 RETVAL
484 857
485void 858void
486SDL_GL_SwapBuffers () 859SDL_GL_SwapBuffers ()
487 860
861char *
862SDL_GetKeyName (int sym)
863
864int
865SDL_GetAppState ()
866
867int
868SDL_GetModState ()
869
488void 870void
489SDL_PollEvent () 871poll_events ()
490 PPCODE: 872 PPCODE:
491{ 873{
492 SDL_Event ev; 874 SDL_Event ev;
493 875
494 while (SDL_PollEvent (&ev)) 876 SDL_PumpEvents ();
877 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
495 { 878 {
496 HV *hv = newHV (); 879 HV *hv = newHV ();
497 hv_store (hv, "type", 4, newSViv (ev.type), 0); 880 hv_store (hv, "type", 4, newSViv (ev.type), 0);
498 881
499 switch (ev.type) 882 switch (ev.type)
500 { 883 {
501 case SDL_KEYDOWN: 884 case SDL_KEYDOWN:
502 case SDL_KEYUP: 885 case SDL_KEYUP:
503 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
504 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
505 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 888 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
889 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
506 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
507 break; 891 break;
508 892
509 case SDL_ACTIVEEVENT: 893 case SDL_ACTIVEEVENT:
510 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 895 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512 break; 896 break;
513 897
514 case SDL_MOUSEMOTION: 898 case SDL_MOUSEMOTION:
899 {
900 int state = ev.motion.state;
901 int x = ev.motion.x;
902 int y = ev.motion.y;
903 int xrel = ev.motion.xrel;
904 int yrel = ev.motion.yrel;
905
906 /* do simplistic event compression */
907 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
908 && state == ev.motion.state)
909 {
910 xrel += ev.motion.xrel;
911 yrel += ev.motion.yrel;
912 x = ev.motion.x;
913 y = ev.motion.y;
914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915 }
916
917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
515 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 918 hv_store (hv, "state", 5, newSViv (state), 0);
516 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 919 hv_store (hv, "x", 1, newSViv (x), 0);
517 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 920 hv_store (hv, "y", 1, newSViv (y), 0);
518 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 921 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
519 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 922 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
923 }
520 break; 924 break;
521 925
522 case SDL_MOUSEBUTTONDOWN: 926 case SDL_MOUSEBUTTONDOWN:
523 case SDL_MOUSEBUTTONUP: 927 case SDL_MOUSEBUTTONUP:
928 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
929
524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 930 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 931 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 932 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 933 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break; 934 break;
532 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 938 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 939 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534 break; 940 break;
535 } 941 }
536 942
537 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
538 } 944 }
539} 945}
540 946
541int 947int
542Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
543 POSTCALL: 949 POSTCALL:
544 Mix_HookMusicFinished (music_finished); 950 Mix_HookMusicFinished (music_finished);
545 Mix_ChannelFinished (channel_finished); 951 Mix_ChannelFinished (channel_finished);
546 952
547void 953void
954Mix_QuerySpec ()
955 PPCODE:
956{
957 int freq, channels;
958 Uint16 format;
959
960 if (Mix_QuerySpec (&freq, &format, &channels))
961 {
962 EXTEND (SP, 3);
963 PUSHs (sv_2mortal (newSViv (freq)));
964 PUSHs (sv_2mortal (newSViv (format)));
965 PUSHs (sv_2mortal (newSViv (channels)));
966 }
967}
968
969void
548Mix_CloseAudio () 970Mix_CloseAudio ()
549 971
550int 972int
551Mix_AllocateChannels (int numchans = -1) 973Mix_AllocateChannels (int numchans = -1)
552 974
975const char *
976Mix_GetError ()
977
553void 978void
554lowdelay (int fd, int val = 1) 979lowdelay (int fd, int val = 1)
555 CODE: 980 CODE:
981 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
982
983void
984win32_proxy_info ()
985 PPCODE:
986{
556#ifndef _WIN32 987#ifdef _WIN32
557 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 988 char buffer[2048];
989 DWORD buflen;
990
991 EXTEND (SP, 3);
992
993 buflen = sizeof (buffer);
994 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
995 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
996 {
997 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
998
999 buflen = sizeof (buffer);
1000 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
1001 {
1002 PUSHs (newSVpv (buffer, 0));
1003
1004 buflen = sizeof (buffer);
1005 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
1006 PUSHs (newSVpv (buffer, 0));
1007 }
1008 }
558#endif 1009#endif
1010}
559 1011
560char * 1012int
561gl_version () 1013add_font (char *file)
562 CODE: 1014 CODE:
563 RETVAL = (char *)glGetString (GL_VERSION); 1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
564 OUTPUT: 1016 OUTPUT:
565 RETVAL 1017 RETVAL
566
567char *
568gl_extensions ()
569 CODE:
570 RETVAL = (char *)glGetString (GL_EXTENSIONS);
571 OUTPUT:
572 RETVAL
573
574void
575add_font (char *file)
576 CODE:
577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
578#ifdef _WIN32
579 // cairo... sigh... requires win2000
580 AddFontResourceEx (file, FR_PRIVATE, 0);
581#endif
582 1018
583void 1019void
584load_image_inline (SV *image_) 1020load_image_inline (SV *image_)
585 ALIAS: 1021 ALIAS:
586 load_image_file = 1 1022 load_image_file = 1
589 STRLEN image_len; 1025 STRLEN image_len;
590 char *image = (char *)SvPVbyte (image_, image_len); 1026 char *image = (char *)SvPVbyte (image_, image_len);
591 SDL_Surface *surface, *surface2; 1027 SDL_Surface *surface, *surface2;
592 SDL_PixelFormat fmt; 1028 SDL_PixelFormat fmt;
593 SDL_RWops *rw = ix 1029 SDL_RWops *rw = ix
594 ? SDL_RWFromFile (image, "r") 1030 ? SDL_RWFromFile (image, "rb")
595 : SDL_RWFromConstMem (image, image_len); 1031 : SDL_RWFromConstMem (image, image_len);
596 1032
597 if (!rw) 1033 if (!rw)
598 croak ("load_image: %s", SDL_GetError ()); 1034 croak ("load_image: %s", SDL_GetError ());
599 1035
628 1064
629 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 1065 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
630 1066
631 assert (surface2->pitch == surface2->w * 4); 1067 assert (surface2->pitch == surface2->w * 4);
632 1068
1069 SDL_LockSurface (surface2);
633 EXTEND (SP, 5); 1070 EXTEND (SP, 6);
634 PUSHs (sv_2mortal (newSViv (surface2->w))); 1071 PUSHs (sv_2mortal (newSViv (surface2->w)));
635 PUSHs (sv_2mortal (newSViv (surface2->h))); 1072 PUSHs (sv_2mortal (newSViv (surface2->h)));
636 SDL_LockSurface (surface2);
637 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1073 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
638 SDL_UnlockSurface (surface2);
639 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1074 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
640 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1075 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1076 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1077 SDL_UnlockSurface (surface2);
642 1078
643 SDL_FreeSurface (surface); 1079 SDL_FreeSurface (surface);
644 SDL_FreeSurface (surface2); 1080 SDL_FreeSurface (surface2);
645} 1081}
646 1082
670} 1106}
671 1107
672void 1108void
673error (char *message) 1109error (char *message)
674 CODE: 1110 CODE:
1111 fprintf (stderr, "ERROR: %s\n", message);
675#ifdef _WIN32 1112#ifdef _WIN32
676 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 1113 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
1114#endif
1115
1116void
1117fatal (char *message)
1118 CODE:
1119 fprintf (stderr, "FATAL: %s\n", message);
1120#ifdef _WIN32
1121 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1122#endif
1123 _exit (1);
1124
1125void
1126_exit (int retval = 0)
1127 CODE:
1128#ifdef WIN32
1129 ExitThread (retval); // unclean, please beam me up
677#else 1130#else
678 fprintf (stderr, "ERROR: %s\n", message); 1131 _exit (retval);
679#endif 1132#endif
680 1133
681void 1134void
682fatal (char *message) 1135debug ()
683 CODE: 1136 CODE:
684#ifdef _WIN32 1137{
685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 1138#if DEBUG
686#else 1139 VALGRIND_DO_LEAK_CHECK;
687 fprintf (stderr, "FATAL: %s\n", message);
688#endif 1140#endif
689 exit (1); 1141}
690 1142
691MODULE = CFClient PACKAGE = CFClient::Font 1143MODULE = Deliantra::Client PACKAGE = DC::Font
692 1144
693CFClient::Font 1145PROTOTYPES: DISABLE
1146
1147DC::Font
694new_from_file (SV *class, char *path, int id = 0) 1148new_from_file (SV *class, char *path, int id = 0)
695 CODE: 1149 CODE:
696{ 1150{
697 int count; 1151 int count;
698 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
701} 1155}
702 OUTPUT: 1156 OUTPUT:
703 RETVAL 1157 RETVAL
704 1158
705void 1159void
706DESTROY (CFClient::Font self) 1160DESTROY (DC::Font self)
707 CODE: 1161 CODE:
708 pango_font_description_free (self); 1162 pango_font_description_free (self);
709 1163
710void 1164void
711make_default (CFClient::Font self) 1165make_default (DC::Font self)
1166 PROTOTYPE: $
712 CODE: 1167 CODE:
713 default_font = self; 1168 default_font = self;
714 1169
715MODULE = CFClient PACKAGE = CFClient::Layout 1170MODULE = Deliantra::Client PACKAGE = DC::Layout
716 1171
717CFClient::Layout 1172PROTOTYPES: DISABLE
718new (SV *class, int rgba = 0) 1173
1174void
1175glyph_cache_backup ()
1176 PROTOTYPE:
1177 CODE:
1178 tc_backup ();
1179
1180void
1181glyph_cache_restore ()
1182 PROTOTYPE:
1183 CODE:
1184 tc_restore ();
1185
1186DC::Layout
1187new (SV *class)
719 CODE: 1188 CODE:
720 New (0, RETVAL, 1, struct cf_layout); 1189 New (0, RETVAL, 1, struct cf_layout);
721 1190
722 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 1191 RETVAL->pl = pango_layout_new (opengl_context);
723 RETVAL->rgba = rgba;
724 RETVAL->r = 1.; 1192 RETVAL->r = 1.;
725 RETVAL->g = 1.; 1193 RETVAL->g = 1.;
726 RETVAL->b = 1.; 1194 RETVAL->b = 1.;
727 RETVAL->a = 1.; 1195 RETVAL->a = 1.;
728 RETVAL->base_height = MIN_FONT_HEIGHT; 1196 RETVAL->base_height = MIN_FONT_HEIGHT;
729 RETVAL->font = 0; 1197 RETVAL->font = 0;
1198 RETVAL->rc = rc_alloc ();
730 1199
731 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1200 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
732 layout_update_font (RETVAL); 1201 layout_update_font (RETVAL);
733 OUTPUT: 1202 OUTPUT:
734 RETVAL 1203 RETVAL
735 1204
736void 1205void
737DESTROY (CFClient::Layout self) 1206DESTROY (DC::Layout self)
738 CODE: 1207 CODE:
739 g_object_unref (self->pl); 1208 g_object_unref (self->pl);
1209 rc_free (self->rc);
740 Safefree (self); 1210 Safefree (self);
741 1211
742int
743is_rgba (CFClient::Layout self)
744 CODE:
745 RETVAL = self->rgba;
746 OUTPUT:
747 RETVAL
748
749void 1212void
750set_text (CFClient::Layout self, SV *text_) 1213set_text (DC::Layout self, SV *text_)
751 CODE: 1214 CODE:
752{ 1215{
753 STRLEN textlen; 1216 STRLEN textlen;
754 char *text = SvPVutf8 (text_, textlen); 1217 char *text = SvPVutf8 (text_, textlen);
755 1218
756 pango_layout_set_text (self->pl, text, textlen); 1219 pango_layout_set_text (self->pl, text, textlen);
757} 1220}
758 1221
759void 1222void
760set_markup (CFClient::Layout self, SV *text_) 1223set_markup (DC::Layout self, SV *text_)
761 CODE: 1224 CODE:
762{ 1225{
763 STRLEN textlen; 1226 STRLEN textlen;
764 char *text = SvPVutf8 (text_, textlen); 1227 char *text = SvPVutf8 (text_, textlen);
765 1228
766 pango_layout_set_markup (self->pl, text, textlen); 1229 pango_layout_set_markup (self->pl, text, textlen);
767} 1230}
768 1231
1232void
1233set_shapes (DC::Layout self, ...)
1234 CODE:
1235{
1236 PangoAttrList *attrs = 0;
1237 const char *text = pango_layout_get_text (self->pl);
1238 const char *pos = text;
1239 int arg = 4;
1240
1241 while (arg < items && (pos = strstr (pos, OBJ_STR)))
1242 {
1243 PangoRectangle inkrect, rect;
1244 PangoAttribute *attr;
1245
1246 int x = SvIV (ST (arg - 3));
1247 int y = SvIV (ST (arg - 2));
1248 int w = SvIV (ST (arg - 1));
1249 int h = SvIV (ST (arg ));
1250
1251 inkrect.x = 0;
1252 inkrect.y = 0;
1253 inkrect.width = 0;
1254 inkrect.height = 0;
1255
1256 rect.x = x * PANGO_SCALE;
1257 rect.y = y * PANGO_SCALE;
1258 rect.width = w * PANGO_SCALE;
1259 rect.height = h * PANGO_SCALE;
1260
1261 if (!attrs)
1262 attrs = pango_layout_get_attributes (self->pl);
1263
1264 attr = pango_attr_shape_new (&inkrect, &rect);
1265 attr->start_index = pos - text;
1266 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
1267 pango_attr_list_insert (attrs, attr);
1268
1269 arg += 4;
1270 pos += sizeof (OBJ_STR) - 1;
1271 }
1272
1273 if (attrs)
1274 pango_layout_set_attributes (self->pl, attrs);
1275}
1276
1277void
1278get_shapes (DC::Layout self)
1279 PPCODE:
1280{
1281 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1282
1283 do
1284 {
1285 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1286
1287 if (run && shape_attr_p (run))
1288 {
1289 PangoRectangle extents;
1290 pango_layout_iter_get_run_extents (iter, 0, &extents);
1291
1292 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1294 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1295 }
1296 }
1297 while (pango_layout_iter_next_run (iter));
1298
1299 pango_layout_iter_free (iter);
1300}
1301
1302int
1303has_wrapped (DC::Layout self)
1304 CODE:
1305{
1306 int lines = 1;
1307 const char *text = pango_layout_get_text (self->pl);
1308
1309 while (*text)
1310 lines += *text++ == '\n';
1311
1312 RETVAL = lines < pango_layout_get_line_count (self->pl);
1313}
1314 OUTPUT:
1315 RETVAL
1316
769SV * 1317SV *
770get_text (CFClient::Layout self) 1318get_text (DC::Layout self)
771 CODE: 1319 CODE:
772 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1320 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
773 SvUTF8_on (RETVAL); 1321 sv_utf8_decode (RETVAL);
774 OUTPUT: 1322 OUTPUT:
775 RETVAL 1323 RETVAL
776 1324
777void 1325void
778set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1326set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
779 CODE: 1327 CODE:
780 self->r = r; 1328 self->r = r;
781 self->g = g; 1329 self->g = g;
782 self->b = b; 1330 self->b = b;
783 self->a = a; 1331 self->a = a;
784 1332
785void 1333void
786set_font (CFClient::Layout self, CFClient::Font font = 0) 1334set_font (DC::Layout self, DC::Font font = 0)
787 CODE: 1335 CODE:
788 if (self->font != font) 1336 if (self->font != font)
789 { 1337 {
790 self->font = font; 1338 self->font = font;
791 layout_update_font (self); 1339 layout_update_font (self);
792 } 1340 }
793 1341
794void 1342void
795set_height (CFClient::Layout self, int base_height) 1343set_height (DC::Layout self, int base_height)
796 CODE: 1344 CODE:
797 if (self->base_height != base_height) 1345 if (self->base_height != base_height)
798 { 1346 {
799 self->base_height = base_height; 1347 self->base_height = base_height;
800 layout_update_font (self); 1348 layout_update_font (self);
801 } 1349 }
802 1350
803void 1351void
804set_width (CFClient::Layout self, int max_width = -1) 1352set_width (DC::Layout self, int max_width = -1)
805 CODE: 1353 CODE:
806 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1354 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
807 1355
808void 1356void
809set_indent (CFClient::Layout self, int indent) 1357set_indent (DC::Layout self, int indent)
810 CODE: 1358 CODE:
811 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1359 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
812 1360
813void 1361void
814set_spacing (CFClient::Layout self, int spacing) 1362set_spacing (DC::Layout self, int spacing)
815 CODE: 1363 CODE:
816 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1364 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
817 1365
818void 1366void
819set_ellipsise (CFClient::Layout self, int ellipsise) 1367set_ellipsise (DC::Layout self, int ellipsise)
820 CODE: 1368 CODE:
821 pango_layout_set_ellipsize (self->pl, 1369 pango_layout_set_ellipsize (self->pl,
822 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1370 ellipsise == 1 ? PANGO_ELLIPSIZE_START
823 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1371 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
824 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1372 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
825 : PANGO_ELLIPSIZE_NONE 1373 : PANGO_ELLIPSIZE_NONE
826 ); 1374 );
827 1375
828void 1376void
829set_single_paragraph_mode (CFClient::Layout self, int spm) 1377set_single_paragraph_mode (DC::Layout self, int spm)
830 CODE: 1378 CODE:
831 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1379 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
832 1380
833void 1381void
834size (CFClient::Layout self) 1382size (DC::Layout self)
835 PPCODE: 1383 PPCODE:
836{ 1384{
837 int w, h; 1385 int w, h;
838 1386
839 layout_get_pixel_size (self, &w, &h); 1387 layout_get_pixel_size (self, &w, &h);
842 PUSHs (sv_2mortal (newSViv (w))); 1390 PUSHs (sv_2mortal (newSViv (w)));
843 PUSHs (sv_2mortal (newSViv (h))); 1391 PUSHs (sv_2mortal (newSViv (h)));
844} 1392}
845 1393
846int 1394int
1395descent (DC::Layout self)
1396 CODE:
1397{
1398 PangoRectangle rect;
1399 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1400 pango_layout_line_get_pixel_extents (line, 0, &rect);
1401 RETVAL = PANGO_DESCENT (rect);
1402}
1403 OUTPUT:
1404 RETVAL
1405
1406int
847xy_to_index (CFClient::Layout self, int x, int y) 1407xy_to_index (DC::Layout self, int x, int y)
848 CODE: 1408 CODE:
849{ 1409{
850 int index, trailing; 1410 int index, trailing;
851 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1411 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
852 RETVAL = index; 1412 RETVAL = index + trailing;
853} 1413}
854 OUTPUT: 1414 OUTPUT:
855 RETVAL 1415 RETVAL
856 1416
857void 1417void
858cursor_pos (CFClient::Layout self, int index) 1418cursor_pos (DC::Layout self, int index)
859 PPCODE: 1419 PPCODE:
860{ 1420{
861 PangoRectangle strong_pos; 1421 PangoRectangle pos;
862 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1422 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
863 1423
864 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
865 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1425 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
866 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
867 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
868} 1428}
869 1429
870void 1430void
871render (CFClient::Layout self) 1431index_to_line_x (DC::Layout self, int index, int trailing = 0)
872 PPCODE: 1432 PPCODE:
873{ 1433{
874 SV *retval; 1434 int line, x;
875 int w, h;
876 1435
877 layout_get_pixel_size (self, &w, &h); 1436 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
878 1437#if !PANGO_VERSION_CHECK (1, 17, 3)
879 if (self->rgba) 1438 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
880 { 1439 --line;
881 cairo_surface_t *surface; 1440#endif
882 cairo_t *cairo;
883
884 retval = newSV (w * h * 4);
885 SvPOK_only (retval);
886 SvCUR_set (retval, w * h * 4);
887
888 memset (SvPVX (retval), 0, w * h * 4);
889
890 surface = cairo_image_surface_create_for_data (
891 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
892 cairo = cairo_create (surface);
893 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
894
895 pango_cairo_show_layout (cairo, self->pl);
896
897 cairo_destroy (cairo);
898 cairo_surface_destroy (surface);
899
900 // what a mess, and its premultiplied, too :(
901 {
902 uint32_t *p = (uint32_t *)SvPVX (retval);
903 uint32_t *e = p + w * h;
904
905 while (p < e)
906 {
907 uint32_t rgba = *p;
908 rgba = (rgba >> 24) | (rgba << 8);
909 rgba = SDL_SwapBE32 (rgba);
910 *p++ = rgba;
911 }
912 }
913
914 EXTEND (SP, 5); 1441 EXTEND (SP, 2);
915 PUSHs (sv_2mortal (newSViv (w))); 1442 PUSHs (sv_2mortal (newSViv (line)));
1443 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1444}
1445
1446void
1447line_x_to_index (DC::Layout self, int line, int x)
1448 PPCODE:
1449{
1450 PangoLayoutLine *lp;
1451 int index, trailing;
1452
1453 if (line < 0)
1454 XSRETURN_EMPTY;
1455
1456 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1457 XSRETURN_EMPTY; /* do better */
1458
1459 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1460
1461 EXTEND (SP, 2);
1462 if (GIMME_V == G_SCALAR)
916 PUSHs (sv_2mortal (newSViv (h))); 1463 PUSHs (sv_2mortal (newSViv (index + trailing)));
917 PUSHs (sv_2mortal (retval));
918 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
919 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
920 }
921 else 1464 else
922 { 1465 {
923 FT_Bitmap bitmap;
924
925 retval = newSV (w * h);
926 SvPOK_only (retval);
927 SvCUR_set (retval, w * h);
928
929 bitmap.rows = h;
930 bitmap.width = w;
931 bitmap.pitch = w;
932 bitmap.buffer = (unsigned char*)SvPVX (retval);
933 bitmap.num_grays = 256;
934 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
935
936 memset (bitmap.buffer, 0, w * h);
937
938 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
939
940 EXTEND (SP, 5);
941 PUSHs (sv_2mortal (newSViv (w))); 1466 PUSHs (sv_2mortal (newSViv (index)));
942 PUSHs (sv_2mortal (newSViv (h))); 1467 PUSHs (sv_2mortal (newSViv (trailing)));
943 PUSHs (sv_2mortal (retval));
944 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
945 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
946 } 1468 }
947} 1469}
948 1470
1471void
1472render (DC::Layout self, float x, float y, int flags = 0)
1473 CODE:
1474 rc_clear (self->rc);
1475 pango_opengl_render_layout_subpixel (
1476 self->pl,
1477 self->rc,
1478 x * PANGO_SCALE, y * PANGO_SCALE,
1479 self->r, self->g, self->b, self->a,
1480 flags
1481 );
1482 // we assume that context_change actually clears/frees stuff
1483 // and does not do any recomputation...
1484 pango_layout_context_changed (self->pl);
1485
1486void
1487draw (DC::Layout self)
1488 CODE:
1489{
1490 glEnable (GL_TEXTURE_2D);
1491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1492 glEnable (GL_BLEND);
1493 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1494 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1495 glEnable (GL_ALPHA_TEST);
1496 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1497
1498 rc_draw (self->rc);
1499
1500 glDisable (GL_ALPHA_TEST);
1501 glDisable (GL_BLEND);
1502 glDisable (GL_TEXTURE_2D);
1503}
1504
949MODULE = CFClient PACKAGE = CFClient::Texture 1505MODULE = Deliantra::Client PACKAGE = DC::Texture
950 1506
1507PROTOTYPES: ENABLE
1508
951void 1509void
1510pad (SV *data_, int ow, int oh, int nw, int nh)
1511 CODE:
1512{
1513 if ((nw != ow || nh != oh) && SvOK (data_))
1514 {
1515 STRLEN datalen;
1516 char *data = SvPVbyte (data_, datalen);
1517 int bpp = datalen / (ow * oh);
1518 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1519
1520 SvPOK_only (result_);
1521 SvCUR_set (result_, nw * nh * bpp);
1522
1523 memset (SvPVX (result_), 0, nw * nh * bpp);
1524 while (oh--)
1525 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1526
1527 sv_setsv (data_, result_);
1528 }
1529}
1530
1531void
952draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1532draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
953 PROTOTYPE: $$$;$$ 1533 PROTOTYPE: $$$;$$
954 ALIAS: 1534 ALIAS:
955 draw_quad_alpha = 1 1535 draw_quad_alpha = 1
956 draw_quad_alpha_premultiplied = 2 1536 draw_quad_alpha_premultiplied = 2
957 CODE: 1537 CODE:
958{ 1538{
959 HV *hv = (HV *)SvRV (self); 1539 HV *hv = (HV *)SvRV (self);
960 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1540 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
961 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1541 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
962 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1542 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
963 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1)); 1543
1544 if (name <= 0)
1545 XSRETURN_EMPTY;
964 1546
965 if (items < 5) 1547 if (items < 5)
966 { 1548 {
967 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1549 w = SvNV (*hv_fetch (hv, "w", 1, 1));
968 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1550 h = SvNV (*hv_fetch (hv, "h", 1, 1));
969 } 1551 }
970 1552
971 if (ix) 1553 if (ix)
972 { 1554 {
973 glEnable (GL_BLEND); 1555 glEnable (GL_BLEND);
1556
1557 if (ix == 2)
974 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1558 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1559 else
1560 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1561 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1562
1563 glEnable (GL_ALPHA_TEST);
1564 glAlphaFunc (GL_GREATER, 0.01f);
975 } 1565 }
976 1566
977 glBindTexture (GL_TEXTURE_2D, name); 1567 glBindTexture (GL_TEXTURE_2D, name);
978
979 if (wrap_mode)
980 {
981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983 }
984 1568
985 glBegin (GL_QUADS); 1569 glBegin (GL_QUADS);
986 glTexCoord2f (0, 0); glVertex2f (x , y ); 1570 glTexCoord2f (0, 0); glVertex2f (x , y );
987 glTexCoord2f (0, t); glVertex2f (x , y + h); 1571 glTexCoord2f (0, t); glVertex2f (x , y + h);
988 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1572 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1573 glTexCoord2f (s, 0); glVertex2f (x + w, y );
990 glEnd (); 1574 glEnd ();
991 1575
992 if (ix) 1576 if (ix)
1577 {
1578 glDisable (GL_ALPHA_TEST);
993 glDisable (GL_BLEND); 1579 glDisable (GL_BLEND);
1580 }
994} 1581}
995 1582
1583IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1584 CODE:
1585{
1586 GLint width;
1587 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1588 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1589 RETVAL = width > 0;
1590}
1591 OUTPUT:
1592 RETVAL
1593
996MODULE = CFClient PACKAGE = CFClient::Map 1594MODULE = Deliantra::Client PACKAGE = DC::Map
997 1595
998CFClient::Map 1596PROTOTYPES: DISABLE
999new (SV *class, int map_width, int map_height) 1597
1598DC::Map
1599new (SV *class)
1000 CODE: 1600 CODE:
1001 New (0, RETVAL, 1, struct map); 1601 New (0, RETVAL, 1, struct map);
1002 RETVAL->x = 0; 1602 RETVAL->x = 0;
1003 RETVAL->y = 0; 1603 RETVAL->y = 0;
1004 RETVAL->w = map_width; 1604 RETVAL->w = 0;
1005 RETVAL->h = map_height; 1605 RETVAL->h = 0;
1006 RETVAL->ox = 0; 1606 RETVAL->ox = 0;
1007 RETVAL->oy = 0; 1607 RETVAL->oy = 0;
1008 RETVAL->faces = 8192; 1608 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1009 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1609 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1010 RETVAL->texs = 8192;
1011 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1012 RETVAL->rows = 0; 1610 RETVAL->rows = 0;
1013 RETVAL->row = 0; 1611 RETVAL->row = 0;
1014 OUTPUT: 1612 OUTPUT:
1015 RETVAL 1613 RETVAL
1016 1614
1017void 1615void
1018DESTROY (CFClient::Map self) 1616DESTROY (DC::Map self)
1019 CODE: 1617 CODE:
1020{ 1618{
1021 map_clear (self); 1619 map_clear (self);
1022 Safefree (self->face); 1620 Safefree (self->face2tile);
1621 Safefree (self->tex);
1023 Safefree (self); 1622 Safefree (self);
1024} 1623}
1025 1624
1026void 1625void
1626resize (DC::Map self, int map_width, int map_height)
1627 CODE:
1628 self->w = map_width;
1629 self->h = map_height;
1630
1631void
1027clear (CFClient::Map self) 1632clear (DC::Map self)
1028 CODE: 1633 CODE:
1029 map_clear (self); 1634 map_clear (self);
1030 1635
1031void 1636void
1032set_face (CFClient::Map self, int face, int texid) 1637set_tileid (DC::Map self, int face, int tile)
1033 CODE: 1638 CODE:
1034{ 1639{
1035 while (self->faces <= face) 1640 need_facenum (self, face); self->face2tile [face] = tile;
1036 { 1641 need_texid (self, tile);
1037 Append (mapface, self->face, self->faces, self->faces);
1038 self->faces *= 2;
1039 }
1040
1041 self->face [face] = texid;
1042} 1642}
1043 1643
1044void 1644void
1645set_smooth (DC::Map self, int face, int smooth, int level)
1646 CODE:
1647{
1648 tileid texid;
1649 maptex *tex;
1650
1651 if (face < 0 || face >= self->faces)
1652 return;
1653
1654 if (smooth < 0 || smooth >= self->faces)
1655 return;
1656
1657 texid = self->face2tile [face];
1658
1659 if (!texid)
1660 return;
1661
1662 tex = self->tex + texid;
1663 tex->smoothtile = self->face2tile [smooth];
1664 tex->smoothlevel = level;
1665}
1666
1667void
1045set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1668set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1046 CODE: 1669 CODE:
1047{ 1670{
1048 while (self->texs <= texid) 1671 need_texid (self, texid);
1049 {
1050 Append (maptex, self->tex, self->texs, self->texs);
1051 self->texs *= 2;
1052 }
1053 1672
1054 { 1673 {
1055 maptex *tex = self->tex + texid; 1674 maptex *tex = self->tex + texid;
1056 1675
1057 tex->name = name; 1676 tex->name = name;
1062 tex->r = r; 1681 tex->r = r;
1063 tex->g = g; 1682 tex->g = g;
1064 tex->b = b; 1683 tex->b = b;
1065 tex->a = a; 1684 tex->a = a;
1066 } 1685 }
1686
1687 // somewhat hackish, but for textures that require it, it really
1688 // improves the look, and most others don't suffer.
1689 glBindTexture (GL_TEXTURE_2D, name);
1690 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1691 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1692 // use uglier nearest interpolation because linear suffers
1693 // from transparent color bleeding and ugly wrapping effects.
1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1067} 1695}
1068 1696
1069int 1697int
1070ox (CFClient::Map self) 1698ox (DC::Map self)
1071 ALIAS: 1699 ALIAS:
1072 oy = 1 1700 oy = 1
1701 x = 2
1702 y = 3
1703 w = 4
1704 h = 5
1073 CODE: 1705 CODE:
1074 switch (ix) 1706 switch (ix)
1075 { 1707 {
1076 case 0: RETVAL = self->ox; break; 1708 case 0: RETVAL = self->ox; break;
1077 case 1: RETVAL = self->oy; break; 1709 case 1: RETVAL = self->oy; break;
1710 case 2: RETVAL = self->x; break;
1711 case 3: RETVAL = self->y; break;
1712 case 4: RETVAL = self->w; break;
1713 case 5: RETVAL = self->h; break;
1078 } 1714 }
1079 OUTPUT: 1715 OUTPUT:
1080 RETVAL 1716 RETVAL
1081 1717
1082void 1718void
1083scroll (CFClient::Map self, int dx, int dy) 1719scroll (DC::Map self, int dx, int dy)
1084 CODE: 1720 CODE:
1085{ 1721{
1086 if (dx > 0) 1722 if (dx > 0)
1087 map_blank (self, self->x, self->y, dx - 1, self->h); 1723 map_blank (self, self->x, self->y, dx, self->h);
1088 else if (dx < 0) 1724 else if (dx < 0)
1089 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1725 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1090 1726
1091 if (dy > 0) 1727 if (dy > 0)
1092 map_blank (self, self->x, self->y, self->w, dy - 1); 1728 map_blank (self, self->x, self->y, self->w, dy);
1093 else if (dy < 0) 1729 else if (dy < 0)
1094 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1730 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1095 1731
1096 self->ox += dx; self->x += dx; 1732 self->ox += dx; self->x += dx;
1097 self->oy += dy; self->y += dy; 1733 self->oy += dy; self->y += dy;
1098 1734
1099 while (self->y < 0) 1735 while (self->y < 0)
1103 self->rows += MAP_EXTEND_Y; 1739 self->rows += MAP_EXTEND_Y;
1104 self->y += MAP_EXTEND_Y; 1740 self->y += MAP_EXTEND_Y;
1105 } 1741 }
1106} 1742}
1107 1743
1108void 1744SV *
1109map1a_update (CFClient::Map self, SV *data_) 1745map1a_update (DC::Map self, SV *data_, int extmap)
1110 CODE: 1746 CODE:
1111{ 1747{
1112 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1113 uint8_t *data_end = (uint8_t *)SvEND (data_); 1749 uint8_t *data_end = (uint8_t *)SvEND (data_);
1114 mapcell *cell; 1750 mapcell *cell;
1115 int x, y, flags; 1751 int x, y, z, flags;
1752 AV *missing = newAV ();
1753 RETVAL = newRV_noinc ((SV *)missing);
1116 1754
1117 while (data < data_end) 1755 while (data < data_end - 1)
1118 { 1756 {
1119 flags = (data [0] << 8) + data [1]; data += 2; 1757 flags = (data [0] << 8) + data [1]; data += 2;
1120 1758
1121 x = ((flags >> 10) & 63) + self->x; 1759 x = self->x + ((flags >> 10) & 63);
1122 y = ((flags >> 4) & 63) + self->y; 1760 y = self->y + ((flags >> 4) & 63);
1123 1761
1124 cell = map_get_cell (self, x, y); 1762 cell = map_get_cell (self, x, y);
1125 1763
1126 if (flags & 15) 1764 if (flags & 15)
1127 { 1765 {
1128 if (cell->darkness < 0) 1766 if (!cell->darkness)
1129 { 1767 {
1768 memset (cell, 0, sizeof (*cell));
1130 cell->darkness = 0; 1769 cell->darkness = 256;
1131 cell->face [0] = 0;
1132 cell->face [1] = 0;
1133 cell->face [2] = 0;
1134 } 1770 }
1135 1771
1136 cell->darkness = flags & 8 ? *data++ : 255;
1137
1138 //TODO: don't trust server data to be in-range(!) 1772 //TODO: don't trust server data to be in-range(!)
1139 1773
1140 if (flags & 4) 1774 if (flags & 8)
1141 { 1775 {
1142 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1776 if (extmap)
1777 {
1778 uint8_t ext, cmd;
1779
1780 do
1781 {
1782 ext = *data++;
1783 cmd = ext & 0x7f;
1784
1785 if (cmd < 4)
1786 cell->darkness = 255 - ext * 64 + 1;
1787 else if (cmd == 5) // health
1788 {
1789 cell->stat_width = 1;
1790 cell->stat_hp = *data++;
1791 }
1792 else if (cmd == 6) // monster width
1793 cell->stat_width = *data++ + 1;
1794 else if (cmd == 0x47)
1795 {
1796 if (*data == 1) cell->player = data [1];
1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1800
1801 data += *data + 1;
1802 }
1803 else if (cmd == 8) // cell flags
1804 cell->flags = *data++;
1805 else if (ext & 0x40) // unknown, multibyte => skip
1806 data += *data + 1;
1807 else
1808 data++;
1809 }
1810 while (ext & 0x80);
1811 }
1812 else
1813 cell->darkness = *data++ + 1;
1143 } 1814 }
1144 1815
1816 for (z = 0; z <= 2; ++z)
1145 if (flags & 2) 1817 if (flags & (4 >> z))
1146 { 1818 {
1147 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1819 faceid face = (data [0] << 8) + data [1]; data += 2;
1820 need_facenum (self, face);
1821 cell->tile [z] = self->face2tile [face];
1822
1823 if (cell->tile [z])
1824 {
1825 maptex *tex = self->tex + cell->tile [z];
1826 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z]));
1828
1829 if (tex->smoothtile)
1830 {
1831 maptex *smooth = self->tex + tex->smoothtile;
1832 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile));
1834 }
1835 }
1148 } 1836 }
1149
1150 if (flags & 1)
1151 {
1152 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1153 }
1154 } 1837 }
1155 else 1838 else
1156 cell->darkness = -1; 1839 CELL_CLEAR (cell);
1157 } 1840 }
1158} 1841}
1842 OUTPUT:
1843 RETVAL
1159 1844
1160SV * 1845SV *
1161mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1846mapmap (DC::Map self, int x0, int y0, int w, int h)
1162 CODE: 1847 CODE:
1163{ 1848{
1164 int x1, x; 1849 int x1, x;
1165 int y1, y; 1850 int y1, y;
1166 int z; 1851 int z;
1187 { 1872 {
1188 mapcell *cell = row->col + (x - row->c0); 1873 mapcell *cell = row->col + (x - row->c0);
1189 1874
1190 for (z = 0; z <= 0; z++) 1875 for (z = 0; z <= 0; z++)
1191 { 1876 {
1192 mapface face = cell->face [z];
1193
1194 if (face)
1195 {
1196 maptex tex = self->tex [face]; 1877 maptex tex = self->tex [cell->tile [z]];
1197 int a0 = 255 - tex.a; 1878 int a0 = 255 - tex.a;
1198 int a1 = tex.a; 1879 int a1 = tex.a;
1199 1880
1200 r = (r * a0 + tex.r * a1) / 255; 1881 r = (r * a0 + tex.r * a1) / 255;
1201 g = (g * a0 + tex.g * a1) / 255; 1882 g = (g * a0 + tex.g * a1) / 255;
1202 b = (b * a0 + tex.b * a1) / 255; 1883 b = (b * a0 + tex.b * a1) / 255;
1203 a = (a * a0 + tex.a * a1) / 255; 1884 a = (a * a0 + tex.a * a1) / 255;
1204 }
1205 } 1885 }
1206 } 1886 }
1207 1887
1208 *map++ = (r ) 1888 *map++ = (r )
1209 | (g << 8) 1889 | (g << 8)
1216} 1896}
1217 OUTPUT: 1897 OUTPUT:
1218 RETVAL 1898 RETVAL
1219 1899
1220void 1900void
1221draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1902 CODE:
1903{
1904 int x, y, z;
1905
1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1909 smooth_key skey;
1910 int pl_x, pl_y;
1911 maptex pl_tex;
1912 rc_t *rc = rc_alloc ();
1913 rc_key_t key;
1914 rc_array_t *arr;
1915
1916 pl_tex.name = 0;
1917
1918 // thats current max. sorry.
1919 if (sw > 255) sw = 255;
1920 if (sh > 255) sh = 255;
1921
1922 // clear key, in case of extra padding
1923 memset (&skey, 0, sizeof (skey));
1924
1925 memset (&key, 0, sizeof (key));
1926 key.r = 255;
1927 key.g = 255;
1928 key.b = 255;
1929 key.a = 255;
1930 key.mode = GL_QUADS;
1931 key.format = GL_T2F_V3F;
1932 key.texname = -1;
1933
1934 mx += self->x;
1935 my += self->y;
1936
1937 // first pass: determine smooth_max
1938 // rather ugly, if you ask me
1939 // could also be stored inside mapcell and updated on change
1940 memset (smooth_max, 0, sizeof (smooth_max));
1941
1942 for (y = 0; y < sh; y++)
1943 if (0 <= y + my && y + my < self->rows)
1944 {
1945 maprow *row = self->row + (y + my);
1946
1947 for (x = 0; x < sw; x++)
1948 if (row->c0 <= x + mx && x + mx < row->c1)
1949 {
1950 mapcell *cell = row->col + (x + mx - row->c0);
1951
1952 smooth_max[x + 1][y + 1] =
1953 MAX (self->tex [cell->tile [0]].smoothlevel,
1954 MAX (self->tex [cell->tile [1]].smoothlevel,
1955 self->tex [cell->tile [2]].smoothlevel));
1956 }
1957 }
1958
1959 glEnable (GL_BLEND);
1960 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1962
1963 for (z = 0; z <= 2; z++)
1964 {
1965 memset (smooth_level, 0, sizeof (smooth_level));
1966
1967 for (y = 0; y < sh; y++)
1968 if (0 <= y + my && y + my < self->rows)
1969 {
1970 maprow *row = self->row + (y + my);
1971
1972 for (x = 0; x < sw; x++)
1973 if (row->c0 <= x + mx && x + mx < row->c1)
1974 {
1975 mapcell *cell = row->col + (x + mx - row->c0);
1976 tileid tile = cell->tile [z];
1977
1978 if (tile)
1979 {
1980 maptex tex = self->tex [tile];
1981 int px = (x + 1) * T - tex.w;
1982 int py = (y + 1) * T - tex.h;
1983
1984 if (key.texname != tex.name)
1985 {
1986 if (!tex.name)
1987 tex = self->tex [2]; /* missing, replace by noface */
1988
1989 key.texname = tex.name;
1990 arr = rc_array (rc, &key);
1991 }
1992
1993 if (expect_false (cell->player == player) && expect_false (z == 2))
1994 {
1995 pl_x = px;
1996 pl_y = py;
1997 pl_tex = tex;
1998 continue;
1999 }
2000
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2005
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
2009 if (cell->flags & 1)
2010 {
2011 maptex tex = self->tex [1];
2012 int px = x * T + T * 2 / 32;
2013 int py = y * T - T * 6 / 32;
2014
2015 if (tex.name)
2016 {
2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2027 }
2028 }
2029 }
2030
2031 // update smooth hash
2032 if (tex.smoothtile)
2033 {
2034 skey.tile = tex.smoothtile;
2035 skey.level = tex.smoothlevel;
2036
2037 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
2038
2039 // add bits to current tile and all neighbours. skey.x|y is
2040 // shifted +1|+1 so we always stay positive.
2041
2042 // bits is ___n cccc CCCC bbbb
2043 // n do not draw borders&corners
2044 // c draw these corners, but...
2045 // C ... not these
2046 // b draw these borders
2047
2048 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
2049 // ┃· ·· ·┃ ━━
2050
2051 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2052 // ·· ·· ·┏ ┓·
2053
2054 // full tile
2055 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
2056
2057 // borders
2058 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
2059 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
2060 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
2061 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
2062
2063 // corners
2064 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2065 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2066 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2067 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2068 }
2069 }
2070 }
2071 }
2072
2073 rc_draw (rc);
2074 rc_clear (rc);
2075
2076 // go through all smoothlevels, lowest to highest, then draw.
2077 // this is basically counting sort
2078 {
2079 int w, b;
2080
2081 glEnable (GL_TEXTURE_2D);
2082 glBegin (GL_QUADS);
2083 for (w = 0; w < 256 / 32; ++w)
2084 {
2085 uint32_t smask = smooth_level [w];
2086 if (smask)
2087 for (b = 0; b < 32; ++b)
2088 if (smask & (((uint32_t)1) << b))
2089 {
2090 int level = (w << 5) | b;
2091 HE *he;
2092
2093 hv_iterinit (smooth);
2094 while ((he = hv_iternext (smooth)))
2095 {
2096 smooth_key *skey = (smooth_key *)HeKEY (he);
2097 IV bits = SvIVX (HeVAL (he));
2098
2099 if (!(bits & 0x1000)
2100 && skey->level == level
2101 && level > smooth_max [skey->x][skey->y])
2102 {
2103 maptex tex = self->tex [skey->tile];
2104 int px = (((int)skey->x) - 1) * T;
2105 int py = (((int)skey->y) - 1) * T;
2106 int border = bits & 15;
2107 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2108 float dx = tex.s * .0625f; // 16 images/row
2109 float dy = tex.t * .5f ; // 2 images/column
2110
2111 if (tex.name)
2112 {
2113 // this time avoiding texture state changes
2114 // save gobs of state changes.
2115 if (key.texname != tex.name)
2116 {
2117 glEnd ();
2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119 glBegin (GL_QUADS);
2120 }
2121
2122 if (border)
2123 {
2124 float ox = border * dx;
2125
2126 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2127 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
2128 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
2129 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
2130 }
2131
2132 if (corner)
2133 {
2134 float ox = corner * dx;
2135
2136 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2137 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
2138 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
2139 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2140 }
2141 }
2142 }
2143 }
2144 }
2145 }
2146
2147 glEnd ();
2148 glDisable (GL_TEXTURE_2D);
2149 key.texname = -1;
2150 }
2151
2152 hv_clear (smooth);
2153 }
2154
2155 if (pl_tex.name)
2156 {
2157 maptex tex = pl_tex;
2158 int px = pl_x + sdx;
2159 int py = pl_y + sdy;
2160
2161 key.texname = tex.name;
2162 arr = rc_array (rc, &key);
2163
2164 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2165 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2166 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168
2169 rc_draw (rc);
2170 }
2171
2172 glDisable (GL_BLEND);
2173 rc_free (rc);
2174
2175 // top layer: overlays such as the health bar
2176 for (y = 0; y < sh; y++)
2177 if (0 <= y + my && y + my < self->rows)
2178 {
2179 maprow *row = self->row + (y + my);
2180
2181 for (x = 0; x < sw; x++)
2182 if (row->c0 <= x + mx && x + mx < row->c1)
2183 {
2184 mapcell *cell = row->col + (x + mx - row->c0);
2185
2186 int px = x * T;
2187 int py = y * T;
2188
2189 if (cell->stat_hp)
2190 {
2191 int width = cell->stat_width * T;
2192 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2193
2194 glColor3ub (0, 0, 0);
2195 glRectf (px + 1, py - thick - 2,
2196 px + width - 1, py);
2197
2198 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
2199 glRectf (px + 2,
2200 py - thick - 1,
2201 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
2202 }
2203 }
2204 }
2205}
2206
2207void
2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2209 CODE:
2210{
2211 static float color[16][3] = {
2212 { 0.00F, 0.00F, 0.00F },
2213 { 1.00F, 1.00F, 1.00F },
2214 { 0.00F, 0.00F, 0.55F },
2215 { 1.00F, 0.00F, 0.00F },
2216
2217 { 1.00F, 0.54F, 0.00F },
2218 { 0.11F, 0.56F, 1.00F },
2219 { 0.93F, 0.46F, 0.00F },
2220 { 0.18F, 0.54F, 0.34F },
2221
2222 { 0.56F, 0.73F, 0.56F },
2223 { 0.80F, 0.80F, 0.80F },
2224 { 0.55F, 0.41F, 0.13F },
2225 { 0.99F, 0.77F, 0.26F },
2226
2227 { 0.74F, 0.65F, 0.41F },
2228
2229 { 0.00F, 1.00F, 1.00F },
2230 { 1.00F, 0.00F, 1.00F },
2231 { 1.00F, 1.00F, 0.00F },
2232 };
2233
2234 int x, y;
2235
2236 glEnable (GL_TEXTURE_2D);
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2238 glEnable (GL_BLEND);
2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240 glBegin (GL_QUADS);
2241
2242 for (y = 0; y < h; y++)
2243 for (x = 0; x < w; x++)
2244 {
2245 unsigned char m = data [x + y * w];
2246
2247 if (m)
2248 {
2249 float *c = color [m & 15];
2250
2251 float tx1 = m & 0x40 ? 0.5 : 0.;
2252 float tx2 = tx1 + 0.5;
2253
2254 glColor4f (c[0], c[1], c[2], 0.75);
2255 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2256 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2257 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2258 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2259 }
2260 }
2261
2262 glEnd ();
2263 glDisable (GL_BLEND);
2264 glDisable (GL_TEXTURE_2D);
2265}
2266
2267void
2268fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1222 PPCODE: 2269 PPCODE:
1223{ 2270{
1224 int vx, vy;
1225 int x, y, z; 2271 int x, y;
1226 int last_name; 2272 int sw1 = sw + 2;
1227 mapface face; 2273 int sh1 = sh + 2;
2274 int sh3 = sh * 3;
1228 int sw4 = (sw + 3) & ~3; 2275 int sw34 = (sw * 3 + 3) & ~3;
2276 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1229 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2277 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1230 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2278 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1231 2279
1232 memset (darkness, 255, sw4 * sh);
1233 SvPOK_only (darkness_sv); 2280 SvPOK_only (darkness3_sv);
1234 SvCUR_set (darkness_sv, sw4 * sh); 2281 SvCUR_set (darkness3_sv, sw34 * sh3);
1235 2282
1236 vx = self->x + (self->w - sw) / 2 - shift_x; 2283 mx += self->x - 1;
1237 vy = self->y + (self->h - sh) / 2 - shift_y; 2284 my += self->y - 1;
1238 2285
1239 /* 2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
1240 int vx = self->vx = self->w >= sw
1241 ? self->x + (self->w - sw) / 2
1242 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1243 2287
1244 int vy = self->vy = self->h >= sh
1245 ? self->y + (self->h - sh) / 2
1246 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1247 */
1248
1249 glColor4ub (255, 255, 255, 255);
1250
1251 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1252 glEnable (GL_BLEND);
1253 glEnable (GL_TEXTURE_2D);
1254 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1255
1256 glBegin (GL_QUADS);
1257
1258 last_name = 0;
1259
1260 for (z = 0; z < 3; z++)
1261 for (y = 0; y < sh; y++) 2288 for (y = 0; y < sh1; y++)
1262 if (0 <= y + vy && y + vy < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
1263 { 2290 {
1264 maprow *row = self->row + (y + vy); 2291 maprow *row = self->row + (y + my);
1265 2292
1266 for (x = 0; x < sw; x++) 2293 for (x = 0; x < sw1; x++)
1267 if (row->c0 <= x + vx && x + vx < row->c1) 2294 if (row->c0 <= x + mx && x + mx < row->c1)
1268 { 2295 {
1269 mapcell *cell = row->col + (x + vx - row->c0); 2296 mapcell *cell = row->col + (x + mx - row->c0);
1270 2297
1271 darkness[y * sw4 + x] = cell->darkness < 0 2298 darkness1 [y * sw1 + x] = cell->darkness
2299 ? 255 - (cell->darkness - 1)
1272 ? 255 - FOW_DARKNESS 2300 : 255 - FOW_DARKNESS;
1273 : 255 - cell->darkness;
1274
1275 face = cell->face [z];
1276
1277 if (face)
1278 {
1279 maptex tex = self->tex [face];
1280
1281 int px = (x + 1) * 32 - tex.w;
1282 int py = (y + 1) * 32 - tex.h;
1283
1284 if (last_name != tex.name)
1285 {
1286 glEnd ();
1287 last_name = tex.name;
1288 glBindTexture (GL_TEXTURE_2D, last_name);
1289 glBegin (GL_QUADS);
1290 }
1291
1292 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1293 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1294 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1295 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1296 }
1297 } 2301 }
1298 } 2302 }
1299 2303
1300 glEnd (); 2304 for (y = 0; y < sh; ++y)
2305 for (x = 0; x < sw; ++x)
2306 {
2307 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2308 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2309 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2310 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2311 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2312 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2313 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2314 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2315 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
1301 2316
1302 glDisable (GL_TEXTURE_2D); 2317 uint8_t r11 = (d11 + d21 + d12) / 3;
1303 glDisable (GL_BLEND); 2318 uint8_t r21 = d21;
2319 uint8_t r31 = (d21 + d31 + d32) / 3;
2320
2321 uint8_t r12 = d12;
2322 uint8_t r22 = d22;
2323 uint8_t r32 = d32;
2324
2325 uint8_t r13 = (d13 + d23 + d12) / 3;
2326 uint8_t r23 = d23;
2327 uint8_t r33 = (d23 + d33 + d32) / 3;
2328
2329 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2332 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2335 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2338 }
2339
2340 free (darkness1);
1304 2341
1305 EXTEND (SP, 3); 2342 EXTEND (SP, 3);
1306 PUSHs (sv_2mortal (newSViv (sw4))); 2343 PUSHs (sv_2mortal (newSViv (sw34)));
1307 PUSHs (sv_2mortal (newSViv (sh))); 2344 PUSHs (sv_2mortal (newSViv (sh3)));
1308 PUSHs (darkness_sv); 2345 PUSHs (darkness3_sv);
1309} 2346}
1310 2347
1311SV * 2348SV *
1312get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2349get_rect (DC::Map self, int x0, int y0, int w, int h)
1313 CODE: 2350 CODE:
1314{ 2351{
1315 int x, y, x1, y1; 2352 int x, y, x1, y1;
1316 SV *data_sv = newSV (w * h * 7 + 5); 2353 SV *data_sv = newSV (w * h * 7 + 5);
1317 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2354 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1342 if (row && row->c0 <= x && x < row->c1) 2379 if (row && row->c0 <= x && x < row->c1)
1343 { 2380 {
1344 mapcell *cell = row->col + (x - row->c0); 2381 mapcell *cell = row->col + (x - row->c0);
1345 uint8_t flags = 0; 2382 uint8_t flags = 0;
1346 2383
1347 if (cell->face [0]) flags |= 1; 2384 if (cell->tile [0]) flags |= 1;
1348 if (cell->face [1]) flags |= 2; 2385 if (cell->tile [1]) flags |= 2;
1349 if (cell->face [2]) flags |= 4; 2386 if (cell->tile [2]) flags |= 4;
1350 2387
1351 *data++ = flags; 2388 *data++ = flags;
1352 2389
1353 if (flags & 1) 2390 if (flags & 1)
1354 { 2391 {
2392 tileid tile = cell->tile [0];
1355 *data++ = cell->face [0] >> 8; 2393 *data++ = tile >> 8;
1356 *data++ = cell->face [0]; 2394 *data++ = tile;
1357 } 2395 }
1358 2396
1359 if (flags & 2) 2397 if (flags & 2)
1360 { 2398 {
2399 tileid tile = cell->tile [1];
1361 *data++ = cell->face [1] >> 8; 2400 *data++ = tile >> 8;
1362 *data++ = cell->face [1]; 2401 *data++ = tile;
1363 } 2402 }
1364 2403
1365 if (flags & 4) 2404 if (flags & 4)
1366 { 2405 {
2406 tileid tile = cell->tile [2];
1367 *data++ = cell->face [2] >> 8; 2407 *data++ = tile >> 8;
1368 *data++ = cell->face [2]; 2408 *data++ = tile;
1369 } 2409 }
1370 } 2410 }
1371 else 2411 else
1372 *data++ = 0; 2412 *data++ = 0;
1373 } 2413 }
1374 } 2414 }
1375 2415
2416 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 {
1376 SvPOK_only (data_sv); 2419 SvPOK_only (data_sv);
1377 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 }
2422
1378 RETVAL = data_sv; 2423 RETVAL = data_sv;
1379} 2424}
1380 OUTPUT: 2425 OUTPUT:
1381 RETVAL 2426 RETVAL
1382 2427
1383void 2428void
1384set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2429set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1385 PPCODE: 2430 PPCODE:
1386{ 2431{
1387 int x, y, z; 2432 int x, y, z;
1388 int w, h; 2433 int w, h;
1389 int x1, y1; 2434 int x1, y1;
2435 STRLEN len;
2436 uint8_t *data, *end;
2437
2438 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv);
2441 end = data + len + 8;
2442
2443 if (len < 5)
2444 XSRETURN_EMPTY;
1390 2445
1391 if (*data++ != 0) 2446 if (*data++ != 0)
1392 return; /* version mismatch */ 2447 XSRETURN_EMPTY; /* version mismatch */
1393 2448
1394 w = *data++ << 8; w |= *data++; 2449 w = *data++ << 8; w |= *data++;
1395 h = *data++ << 8; h |= *data++; 2450 h = *data++ << 8; h |= *data++;
1396 2451
1397 // we need to do this 'cause we don't keep an absolute coord system for rows 2452 // we need to do this 'cause we don't keep an absolute coord system for rows
1409 { 2464 {
1410 maprow *row = map_get_row (self, y); 2465 maprow *row = map_get_row (self, y);
1411 2466
1412 for (x = x0; x < x1; x++) 2467 for (x = x0; x < x1; x++)
1413 { 2468 {
2469 uint8_t flags;
2470
2471 if (data + 7 >= end)
2472 XSRETURN_EMPTY;
2473
1414 uint8_t flags = *data++; 2474 flags = *data++;
1415 2475
1416 if (flags) 2476 if (flags)
1417 { 2477 {
1418 mapface face[3] = { 0, 0, 0 };
1419
1420 mapcell *cell = row_get_cell (row, x); 2478 mapcell *cell = row_get_cell (row, x);
2479 tileid tile[3] = { 0, 0, 0 };
1421 2480
1422 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2481 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1423 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2482 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1424 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2483 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1425 2484
1426 if (cell->darkness <= 0) 2485 if (cell->darkness == 0)
1427 { 2486 {
1428 cell->darkness = -1; 2487 /*cell->darkness = 0;*/
2488 EXTEND (SP, 3);
1429 2489
1430 for (z = 0; z <= 2; z++) 2490 for (z = 0; z <= 2; z++)
1431 { 2491 {
1432 cell->face[z] = face[z]; 2492 tileid t = tile [z];
1433 2493
1434 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2494 if (t >= self->texs || (t && !self->tex [t].name))
2495 {
1435 XPUSHs (sv_2mortal (newSViv (face[z]))); 2496 PUSHs (sv_2mortal (newSViv (t)));
2497 need_texid (self, t);
2498 }
2499
2500 cell->tile [z] = t;
1436 } 2501 }
1437 } 2502 }
1438 } 2503 }
1439 } 2504 }
1440 } 2505 }
1441} 2506}
1442 2507
1443MODULE = CFClient PACKAGE = CFClient::MixChunk 2508MODULE = Deliantra::Client PACKAGE = DC::RW
1444 2509
1445CFClient::MixChunk 2510DC::RW
1446new_from_file (SV *class, char *path) 2511new (SV *class, SV *data_sv)
1447 CODE: 2512 CODE:
1448 RETVAL = Mix_LoadWAV (path); 2513{
2514 STRLEN datalen;
2515 char *data = SvPVbyte (data_sv, datalen);
2516
2517 RETVAL = SDL_RWFromConstMem (data, datalen);
2518}
1449 OUTPUT: 2519 OUTPUT:
1450 RETVAL 2520 RETVAL
1451 2521
2522DC::RW
2523new_from_file (SV *class, const char *path, const char *mode = "rb")
2524 CODE:
2525 RETVAL = SDL_RWFromFile (path, mode);
2526 OUTPUT:
2527 RETVAL
2528
2529# fails on win32:
2530# dc.xs(2268) : error C2059: syntax error : '('
1452void 2531#void
2532#close (DC::RW self)
2533# CODE:
2534# (self->(close)) (self);
2535
2536MODULE = Deliantra::Client PACKAGE = DC::Channel
2537
2538PROTOTYPES: DISABLE
2539
2540DC::Channel
2541find ()
2542 CODE:
2543{
2544 RETVAL = Mix_GroupAvailable (-1);
2545
2546 if (RETVAL < 0)
2547 {
2548 RETVAL = Mix_GroupOldest (-1);
2549
2550 if (RETVAL < 0)
2551 XSRETURN_UNDEF;
2552
2553 Mix_HaltChannel (RETVAL);
2554 }
2555
2556 Mix_UnregisterAllEffects (RETVAL);
2557 Mix_Volume (RETVAL, 128);
2558}
2559 OUTPUT:
2560 RETVAL
2561
2562void
2563halt (DC::Channel self)
2564 CODE:
2565 Mix_HaltChannel (self);
2566
2567void
2568expire (DC::Channel self, int ticks = -1)
2569 CODE:
2570 Mix_ExpireChannel (self, ticks);
2571
2572void
2573fade_out (DC::Channel self, int ticks = -1)
2574 CODE:
2575 Mix_FadeOutChannel (self, ticks);
2576
2577int
2578volume (DC::Channel self, int volume)
2579 CODE:
2580 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2581 OUTPUT:
2582 RETVAL
2583
2584void
2585unregister_all_effects (DC::Channel self)
2586 CODE:
2587 Mix_UnregisterAllEffects (self);
2588
2589void
2590set_panning (DC::Channel self, int left, int right)
2591 CODE:
2592 left = CLAMP (left , 0, 255);
2593 right = CLAMP (right, 0, 255);
2594 Mix_SetPanning (self, left, right);
2595
2596void
2597set_distance (DC::Channel self, int distance)
2598 CODE:
2599 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2600
2601void
2602set_position (DC::Channel self, int angle, int distance)
2603 CODE:
2604
2605void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE:
2608{
2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2610 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612}
2613
2614void
2615set_reverse_stereo (DC::Channel self, int flip)
2616 CODE:
2617 Mix_SetReverseStereo (self, flip);
2618
2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2620
2621PROTOTYPES: DISABLE
2622
2623DC::MixChunk
2624new (SV *class, DC::RW rwops)
2625 CODE:
2626 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2627 OUTPUT:
2628 RETVAL
2629
2630void
1453DESTROY (CFClient::MixChunk self) 2631DESTROY (DC::MixChunk self)
1454 CODE: 2632 CODE:
1455 Mix_FreeChunk (self); 2633 Mix_FreeChunk (self);
1456 2634
1457int 2635int
1458volume (CFClient::MixChunk self, int volume = -1) 2636volume (DC::MixChunk self, int volume = -1)
1459 CODE: 2637 CODE:
2638 if (items > 1)
2639 volume = CLAMP (volume, 0, 128);
1460 RETVAL = Mix_VolumeChunk (self, volume); 2640 RETVAL = Mix_VolumeChunk (self, volume);
1461 OUTPUT: 2641 OUTPUT:
1462 RETVAL 2642 RETVAL
1463 2643
1464int 2644DC::Channel
1465play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2645play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
1466 CODE: 2646 CODE:
2647{
1467 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2648 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2649
2650 if (RETVAL < 0)
2651 XSRETURN_UNDEF;
2652
2653 if (channel < 0)
2654 {
2655 Mix_UnregisterAllEffects (RETVAL);
2656 Mix_Volume (RETVAL, 128);
2657 }
2658}
1468 OUTPUT: 2659 OUTPUT:
1469 RETVAL 2660 RETVAL
1470 2661
1471MODULE = CFClient PACKAGE = CFClient::MixMusic 2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1472 2663
1473int 2664int
1474volume (int volume = -1) 2665volume (int volume = -1)
2666 PROTOTYPE: ;$
1475 CODE: 2667 CODE:
2668 if (items > 0)
2669 volume = CLAMP (volume, 0, 128);
1476 RETVAL = Mix_VolumeMusic (volume); 2670 RETVAL = Mix_VolumeMusic (volume);
1477 OUTPUT: 2671 OUTPUT:
1478 RETVAL 2672 RETVAL
1479 2673
1480CFClient::MixMusic 2674void
1481new_from_file (SV *class, char *path) 2675fade_out (int ms)
1482 CODE: 2676 CODE:
2677 Mix_FadeOutMusic (ms);
2678
2679void
2680halt ()
2681 CODE:
2682 Mix_HaltMusic ();
2683
2684DC::MixMusic
2685new (SV *class, DC::RW rwops)
2686 CODE:
1483 RETVAL = Mix_LoadMUS (path); 2687 RETVAL = Mix_LoadMUS_RW (rwops);
1484 OUTPUT: 2688 OUTPUT:
1485 RETVAL 2689 RETVAL
1486 2690
1487void 2691void
1488DESTROY (CFClient::MixMusic self) 2692DESTROY (DC::MixMusic self)
1489 CODE: 2693 CODE:
1490 Mix_FreeMusic (self); 2694 Mix_FreeMusic (self);
1491 2695
1492int 2696int
1493play (CFClient::MixMusic self, int loops = -1) 2697play (DC::MixMusic self, int loops = -1)
1494 CODE: 2698 CODE:
1495 RETVAL = Mix_PlayMusic (self, loops); 2699 RETVAL = Mix_PlayMusic (self, loops);
1496 OUTPUT: 2700 OUTPUT:
1497 RETVAL 2701 RETVAL
1498 2702
2703void
2704fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2705 CODE:
2706 Mix_FadeInMusicPos (self, loops, ms, position);
2707
1499MODULE = CFClient PACKAGE = CFClient::OpenGL 2708MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2709
2710PROTOTYPES: ENABLE
1500 2711
1501BOOT: 2712BOOT:
1502{ 2713{
1503 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2714 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1504 static const struct { 2715 static const struct {
1505 const char *name; 2716 const char *name;
1506 IV iv; 2717 IV iv;
1507 } *civ, const_iv[] = { 2718 } *civ, const_iv[] = {
1508# define const_iv(name) { # name, (IV)name } 2719# define const_iv(name) { # name, (IV)name }
2720 const_iv (GL_VENDOR),
2721 const_iv (GL_VERSION),
2722 const_iv (GL_EXTENSIONS),
1509 const_iv (GL_COLOR_MATERIAL), 2723 const_iv (GL_COLOR_MATERIAL),
1510 const_iv (GL_SMOOTH), 2724 const_iv (GL_SMOOTH),
1511 const_iv (GL_FLAT), 2725 const_iv (GL_FLAT),
1512 const_iv (GL_DITHER), 2726 const_iv (GL_DITHER),
1513 const_iv (GL_BLEND), 2727 const_iv (GL_BLEND),
2728 const_iv (GL_CULL_FACE),
1514 const_iv (GL_SCISSOR_TEST), 2729 const_iv (GL_SCISSOR_TEST),
2730 const_iv (GL_DEPTH_TEST),
2731 const_iv (GL_ALPHA_TEST),
2732 const_iv (GL_NORMALIZE),
2733 const_iv (GL_RESCALE_NORMAL),
2734 const_iv (GL_FRONT),
2735 const_iv (GL_BACK),
2736 const_iv (GL_AUX0),
1515 const_iv (GL_AND), 2737 const_iv (GL_AND),
1516 const_iv (GL_ONE), 2738 const_iv (GL_ONE),
1517 const_iv (GL_ZERO), 2739 const_iv (GL_ZERO),
1518 const_iv (GL_SRC_ALPHA), 2740 const_iv (GL_SRC_ALPHA),
1519 const_iv (GL_SRC_ALPHA_SATURATE), 2741 const_iv (GL_DST_ALPHA),
1520 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2742 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521 const_iv (GL_ONE_MINUS_DST_ALPHA), 2743 const_iv (GL_ONE_MINUS_DST_ALPHA),
2744 const_iv (GL_SRC_ALPHA_SATURATE),
1522 const_iv (GL_RGB), 2745 const_iv (GL_RGB),
1523 const_iv (GL_RGBA), 2746 const_iv (GL_RGBA),
2747 const_iv (GL_RGBA4),
2748 const_iv (GL_RGBA8),
2749 const_iv (GL_RGB5_A1),
1524 const_iv (GL_UNSIGNED_BYTE), 2750 const_iv (GL_UNSIGNED_BYTE),
2751 const_iv (GL_UNSIGNED_SHORT),
2752 const_iv (GL_UNSIGNED_INT),
1525 const_iv (GL_ALPHA), 2753 const_iv (GL_ALPHA),
2754 const_iv (GL_INTENSITY),
1526 const_iv (GL_LUMINANCE), 2755 const_iv (GL_LUMINANCE),
2756 const_iv (GL_LUMINANCE_ALPHA),
1527 const_iv (GL_FLOAT), 2757 const_iv (GL_FLOAT),
1528 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2758 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2759 const_iv (GL_COMPRESSED_ALPHA_ARB),
2760 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2761 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2762 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2763 const_iv (GL_COMPRESSED_RGB_ARB),
2764 const_iv (GL_COMPRESSED_RGBA_ARB),
1529 const_iv (GL_COMPILE), 2765 const_iv (GL_COMPILE),
2766 const_iv (GL_PROXY_TEXTURE_1D),
2767 const_iv (GL_PROXY_TEXTURE_2D),
1530 const_iv (GL_TEXTURE_1D), 2768 const_iv (GL_TEXTURE_1D),
1531 const_iv (GL_TEXTURE_2D), 2769 const_iv (GL_TEXTURE_2D),
1532 const_iv (GL_TEXTURE_ENV), 2770 const_iv (GL_TEXTURE_ENV),
1533 const_iv (GL_TEXTURE_MAG_FILTER), 2771 const_iv (GL_TEXTURE_MAG_FILTER),
1534 const_iv (GL_TEXTURE_MIN_FILTER), 2772 const_iv (GL_TEXTURE_MIN_FILTER),
1535 const_iv (GL_TEXTURE_ENV_MODE), 2773 const_iv (GL_TEXTURE_ENV_MODE),
1536 const_iv (GL_TEXTURE_WRAP_S), 2774 const_iv (GL_TEXTURE_WRAP_S),
1537 const_iv (GL_TEXTURE_WRAP_T), 2775 const_iv (GL_TEXTURE_WRAP_T),
2776 const_iv (GL_REPEAT),
1538 const_iv (GL_CLAMP), 2777 const_iv (GL_CLAMP),
1539 const_iv (GL_REPEAT), 2778 const_iv (GL_CLAMP_TO_EDGE),
1540 const_iv (GL_NEAREST), 2779 const_iv (GL_NEAREST),
1541 const_iv (GL_LINEAR), 2780 const_iv (GL_LINEAR),
1542 const_iv (GL_NEAREST_MIPMAP_NEAREST), 2781 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1543 const_iv (GL_LINEAR_MIPMAP_NEAREST), 2782 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1544 const_iv (GL_NEAREST_MIPMAP_LINEAR), 2783 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1545 const_iv (GL_LINEAR_MIPMAP_LINEAR), 2784 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1546 const_iv (GL_GENERATE_MIPMAP), 2785 const_iv (GL_GENERATE_MIPMAP),
1547 const_iv (GL_MODULATE), 2786 const_iv (GL_MODULATE),
1548 const_iv (GL_DECAL), 2787 const_iv (GL_DECAL),
1549 const_iv (GL_REPLACE), 2788 const_iv (GL_REPLACE),
2789 const_iv (GL_DEPTH_BUFFER_BIT),
1550 const_iv (GL_COLOR_BUFFER_BIT), 2790 const_iv (GL_COLOR_BUFFER_BIT),
1551 const_iv (GL_PROJECTION), 2791 const_iv (GL_PROJECTION),
1552 const_iv (GL_MODELVIEW), 2792 const_iv (GL_MODELVIEW),
1553 const_iv (GL_COLOR_LOGIC_OP), 2793 const_iv (GL_COLOR_LOGIC_OP),
1554 const_iv (GL_SEPARABLE_2D), 2794 const_iv (GL_SEPARABLE_2D),
1555 const_iv (GL_CONVOLUTION_2D), 2795 const_iv (GL_CONVOLUTION_2D),
1556 const_iv (GL_CONVOLUTION_BORDER_MODE), 2796 const_iv (GL_CONVOLUTION_BORDER_MODE),
1557 const_iv (GL_CONSTANT_BORDER), 2797 const_iv (GL_CONSTANT_BORDER),
2798 const_iv (GL_POINTS),
1558 const_iv (GL_LINES), 2799 const_iv (GL_LINES),
2800 const_iv (GL_LINE_STRIP),
2801 const_iv (GL_LINE_LOOP),
1559 const_iv (GL_QUADS), 2802 const_iv (GL_QUADS),
2803 const_iv (GL_QUAD_STRIP),
2804 const_iv (GL_TRIANGLES),
2805 const_iv (GL_TRIANGLE_STRIP),
2806 const_iv (GL_TRIANGLE_FAN),
1560 const_iv (GL_LINE_LOOP), 2807 const_iv (GL_POLYGON),
1561 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2808 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2809 const_iv (GL_POINT_SMOOTH_HINT),
2810 const_iv (GL_LINE_SMOOTH_HINT),
2811 const_iv (GL_POLYGON_SMOOTH_HINT),
2812 const_iv (GL_GENERATE_MIPMAP_HINT),
2813 const_iv (GL_TEXTURE_COMPRESSION_HINT),
1562 const_iv (GL_FASTEST), 2814 const_iv (GL_FASTEST),
2815 const_iv (GL_DONT_CARE),
2816 const_iv (GL_NICEST),
2817 const_iv (GL_V2F),
2818 const_iv (GL_V3F),
2819 const_iv (GL_T2F_V3F),
2820 const_iv (GL_T2F_N3F_V3F),
1563# undef const_iv 2821# undef const_iv
1564 }; 2822 };
1565 2823
1566 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2824 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1567 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2826
2827 texture_av = newAV ();
2828 AvREAL_off (texture_av);
1568} 2829}
2830
2831void
2832disable_GL_EXT_blend_func_separate ()
2833 CODE:
2834 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0;
2836
2837char *
2838gl_vendor ()
2839 CODE:
2840 RETVAL = (char *)glGetString (GL_VENDOR);
2841 OUTPUT:
2842 RETVAL
2843
2844char *
2845gl_version ()
2846 CODE:
2847 RETVAL = (char *)glGetString (GL_VERSION);
2848 OUTPUT:
2849 RETVAL
2850
2851char *
2852gl_extensions ()
2853 CODE:
2854 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2855 OUTPUT:
2856 RETVAL
2857
2858const char *glGetString (GLenum pname)
2859
2860GLint glGetInteger (GLenum pname)
2861 CODE:
2862 glGetIntegerv (pname, &RETVAL);
2863 OUTPUT:
2864 RETVAL
2865
2866GLdouble glGetDouble (GLenum pname)
2867 CODE:
2868 glGetDoublev (pname, &RETVAL);
2869 OUTPUT:
2870 RETVAL
1569 2871
1570int glGetError () 2872int glGetError ()
2873
2874void glFinish ()
1571 2875
1572void glClear (int mask) 2876void glClear (int mask)
1573 2877
1574void glClearColor (float r, float g, float b, float a = 1.0) 2878void glClearColor (float r, float g, float b, float a = 1.0)
1575 PROTOTYPE: @ 2879 PROTOTYPE: @
1582 2886
1583void glHint (int target, int mode) 2887void glHint (int target, int mode)
1584 2888
1585void glBlendFunc (int sfactor, int dfactor) 2889void glBlendFunc (int sfactor, int dfactor)
1586 2890
2891void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2892 CODE:
2893 gl_BlendFuncSeparate (sa, da, saa, daa);
2894
2895void glDepthMask (int flag)
2896
1587void glLogicOp (int opcode) 2897void glLogicOp (int opcode)
1588 2898
1589void glColorMask (int red, int green, int blue, int alpha) 2899void glColorMask (int red, int green, int blue, int alpha)
1590 2900
1591void glMatrixMode (int mode) 2901void glMatrixMode (int mode)
1594 2904
1595void glPopMatrix () 2905void glPopMatrix ()
1596 2906
1597void glLoadIdentity () 2907void glLoadIdentity ()
1598 2908
2909void glDrawBuffer (int buffer)
2910
2911void glReadBuffer (int buffer)
2912
1599# near and far are due to microsofts buggy c compiler 2913# near_ and far_ are due to microsofts buggy "c" compiler
2914void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2915
2916# near_ and far_ are due to microsofts buggy "c" compiler
1600void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2917void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2918
2919PROTOTYPES: DISABLE
1601 2920
1602void glViewport (int x, int y, int width, int height) 2921void glViewport (int x, int y, int width, int height)
1603 2922
1604void glScissor (int x, int y, int width, int height) 2923void glScissor (int x, int y, int width, int height)
1605 2924
1613 2932
1614void glRotate (float angle, float x, float y, float z) 2933void glRotate (float angle, float x, float y, float z)
1615 CODE: 2934 CODE:
1616 glRotatef (angle, x, y, z); 2935 glRotatef (angle, x, y, z);
1617 2936
1618void glBegin (int mode)
1619
1620void glEnd ()
1621
1622void glColor (float r, float g, float b, float a = 1.0) 2937void glColor (float r, float g, float b, float a = 1.0)
1623 PROTOTYPE: @ 2938 ALIAS:
2939 glColor_premultiply = 1
1624 CODE: 2940 CODE:
1625 glColor4ub (MIN ((int)(r * 255.f), 255), 2941 if (ix)
1626 MIN ((int)(g * 255.f), 255), 2942 {
1627 MIN ((int)(b * 255.f), 255), 2943 r *= a;
1628 MIN ((int)(a * 255.f), 255)); 2944 g *= a;
2945 b *= a;
2946 }
2947 // microsoft visual "c" rounds instead of truncating...
2948 glColor4f (r, g, b, a);
2949
2950void glRasterPos (float x, float y, float z = 0.)
2951 CODE:
2952 glRasterPos3f (0, 0, z);
2953 glBitmap (0, 0, 0, 0, x, y, 0);
1629 2954
1630void glVertex (float x, float y, float z = 0.) 2955void glVertex (float x, float y, float z = 0.)
1631 CODE: 2956 CODE:
1632 glVertex3f (x, y, z); 2957 glVertex3f (x, y, z);
1633 2958
1634void glTexCoord (float s, float t) 2959void glTexCoord (float s, float t)
1635 CODE: 2960 CODE:
1636 glTexCoord2f (s, t); 2961 glTexCoord2f (s, t);
1637 2962
2963void glRect (float x1, float y1, float x2, float y2)
2964 CODE:
2965 glRectf (x1, y1, x2, y2);
2966
2967void glRect_lineloop (float x1, float y1, float x2, float y2)
2968 CODE:
2969 glBegin (GL_LINE_LOOP);
2970 glVertex2f (x1, y1);
2971 glVertex2f (x2, y1);
2972 glVertex2f (x2, y2);
2973 glVertex2f (x1, y2);
2974 glEnd ();
2975
2976PROTOTYPES: ENABLE
2977
2978void glBegin (int mode)
2979
2980void glEnd ()
2981
2982void glPointSize (GLfloat size)
2983
2984void glLineWidth (GLfloat width)
2985
2986void glInterleavedArrays (int format, int stride, char *data)
2987
2988void glDrawElements (int mode, int count, int type, char *indices)
2989
2990# 1.2 void glDrawRangeElements (int mode, int start, int end
2991
1638void glTexEnv (int target, int pname, float param) 2992void glTexEnv (int target, int pname, float param)
1639 CODE: 2993 CODE:
1640 glTexEnvf (target, pname, param); 2994 glTexEnvf (target, pname, param);
1641 2995
1642void glTexParameter (int target, int pname, float param) 2996void glTexParameter (int target, int pname, float param)
1645 2999
1646void glBindTexture (int target, int name) 3000void glBindTexture (int target, int name)
1647 3001
1648void glConvolutionParameter (int target, int pname, float params) 3002void glConvolutionParameter (int target, int pname, float params)
1649 CODE: 3003 CODE:
1650 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 3004 if (gl.ConvolutionParameterf)
3005 gl.ConvolutionParameterf (target, pname, params);
1651 3006
1652void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 3007void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1653 CODE: 3008 CODE:
1654 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 3009 if (gl.ConvolutionFilter2D)
1655 (target, internalformat, width, height, format, type, data)); 3010 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1656 3011
1657void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3012void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1658 CODE: 3013 CODE:
1659 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 3014 if (gl.SeparableFilter2D)
1660 (target, internalformat, width, height, format, type, row, column)); 3015 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1661 3016
1662void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3017void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
1663 3018
1664void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3019void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1665 3020
1666void glRasterPos (int x, int y) 3021void glDrawPixels (int width, int height, int format, int type, char *pixels)
1667 CODE: 3022
1668 glRasterPos2i (x, y); 3023void glPixelZoom (float x, float y)
1669 3024
1670void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3025void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1671 3026
1672int glGenTexture () 3027int glGenTexture ()
1673 CODE: 3028 CODE:
1674{ 3029 RETVAL = gen_texture ();
1675 GLuint name;
1676 glGenTextures (1, &name);
1677 RETVAL = name;
1678}
1679 OUTPUT: 3030 OUTPUT:
1680 RETVAL 3031 RETVAL
1681 3032
1682void glDeleteTexture (int name) 3033void glDeleteTexture (int name)
1683 CODE: 3034 CODE:
1684{
1685 GLuint name_ = name;
1686 glDeleteTextures (1, &name_); 3035 del_texture (name);
1687} 3036
1688
1689int glGenList () 3037int glGenList ()
1690 CODE: 3038 CODE:
1691 RETVAL = glGenLists (1); 3039 RETVAL = glGenLists (1);
1692 OUTPUT: 3040 OUTPUT:
1693 RETVAL 3041 RETVAL
1700 3048
1701void glEndList () 3049void glEndList ()
1702 3050
1703void glCallList (int list) 3051void glCallList (int list)
1704 3052
3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054
3055PROTOTYPES: DISABLE
3056
3057void
3058find_widget (SV *self, NV x, NV y)
3059 PPCODE:
3060{
3061 if (within_widget (self, x, y))
3062 XPUSHs (self);
3063}
3064
3065BOOT:
3066{
3067 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3068
3069 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3070 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3071 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3072 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3073}
3074
3075void
3076draw (SV *self)
3077 CODE:
3078{
3079 HV *hv;
3080 SV **svp;
3081 NV x, y, w, h;
3082 SV *draw_x_sv = GvSV (draw_x_gv);
3083 SV *draw_y_sv = GvSV (draw_y_gv);
3084 SV *draw_w_sv = GvSV (draw_w_gv);
3085 SV *draw_h_sv = GvSV (draw_h_gv);
3086 double draw_x, draw_y;
3087
3088 if (!SvROK (self))
3089 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3090
3091 hv = (HV *)SvRV (self);
3092
3093 if (SvTYPE (hv) != SVt_PVHV)
3094 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3095
3096 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3097 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3098
3099 if (!h || !w)
3100 XSRETURN_EMPTY;
3101
3102 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3103 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3104
3105 draw_x = SvNV (draw_x_sv) + x;
3106 draw_y = SvNV (draw_y_sv) + y;
3107
3108 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3109 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3110 XSRETURN_EMPTY;
3111
3112 sv_setnv (draw_x_sv, draw_x);
3113 sv_setnv (draw_y_sv, draw_y);
3114
3115 glPushMatrix ();
3116 glTranslated (x, y, 0);
3117
3118 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3119 {
3120 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3121
3122 if (svp && SvTRUE (*svp))
3123 {
3124 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3125 glEnable (GL_BLEND);
3126 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3127 glBegin (GL_QUADS);
3128 glVertex2f (0, 0);
3129 glVertex2f (w, 0);
3130 glVertex2f (w, h);
3131 glVertex2f (0, h);
3132 glEnd ();
3133 glDisable (GL_BLEND);
3134 }
3135 }
3136#if 0
3137 // draw borders, for debugging
3138 glPushMatrix ();
3139 glColor4f (1., 1., 0., 1.);
3140 glTranslatef (.5, .5, 0.);
3141 glBegin (GL_LINE_LOOP);
3142 glVertex2f (0 , 0);
3143 glVertex2f (w - 1, 0);
3144 glVertex2f (w - 1, h - 1);
3145 glVertex2f (0 , h - 1);
3146 glEnd ();
3147 glPopMatrix ();
3148#endif
3149 PUSHMARK (SP);
3150 XPUSHs (self);
3151 PUTBACK;
3152 call_method ("_draw", G_VOID | G_DISCARD);
3153 SPAGAIN;
3154
3155 glPopMatrix ();
3156
3157 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3158 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3159}
3160

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines