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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines